Merge pull request #323 from TrekkieCoder/main

PR - Added trace dump for goRPC routines #313

loxinet/loxinet.go

@@ -25,8 +25,11 @@ import (
 	cmn "github.com/loxilb-io/loxilb/common"
 	opts "github.com/loxilb-io/loxilb/options"
 	tk "github.com/loxilb-io/loxilib"
+	"io"
 	"net"
+	"net/http"
 	_ "net/http/pprof"
+	"net/rpc"
 	"os"
 	"os/signal"
 	"runtime/debug"
@@ -75,6 +78,42 @@ type loxiNetH struct {
 	pFile  *os.File
 }
 
+// LoxiXsyncMain - State Sync subsystem init
+func LoxiXsyncMain() {
+	if opts.Opts.ClusterNodes == "none" {
+		return
+	}
+
+	// Stack trace logger
+	defer func() {
+		if e := recover(); e != nil {
+			if mh.logger != nil {
+				tk.LogIt(tk.LogCritical, "%s: %s", e, debug.Stack())
+			}
+		}
+	}()
+
+	for {
+		rpcObj := new(XSync)
+		err := rpc.Register(rpcObj)
+		if err != nil {
+			panic("Failed to register rpc")
+		}
+
+		rpc.HandleHTTP()
+
+		http.HandleFunc("/", func(res http.ResponseWriter, req *http.Request) {
+			io.WriteString(res, "loxilb-xsync\n")
+		})
+
+		listener := fmt.Sprintf(":%d", XSyncPort)
+		err = http.ListenAndServe(listener, nil)
+		if err != nil {
+			panic("Failed to rpc-listen")
+		}
+	}
+}
+
 // NodeWalker - an implementation of node walker interface
 func (mh *loxiNetH) NodeWalker(b string) {
 	tk.LogIt(tk.LogDebug, "%s\n", b)

main.go

@@ -18,36 +18,13 @@ package main
 
 import (
 	"fmt"
-	"io"
-	"net/http"
-	"net/rpc"
-	"os"
-	"time"
-
 	"github.com/jessevdk/go-flags"
 	ln "github.com/loxilb-io/loxilb/loxinet"
 	opts "github.com/loxilb-io/loxilb/options"
+	"os"
+	"time"
 )
 
-// loxiXsyncMain - State Sync subsystem init
-func loxiXsyncMain() {
-	if opts.Opts.ClusterNodes == "none" {
-		return
-	}
-	for {
-		rpcObj := new(ln.XSync)
-		rpc.Register(rpcObj)
-		rpc.HandleHTTP()
-
-		http.HandleFunc("/", func(res http.ResponseWriter, req *http.Request) {
-			io.WriteString(res, "loxilb-xsync\n")
-		})
-
-		listener := fmt.Sprintf(":%d", ln.XSyncPort)
-		http.ListenAndServe(listener, nil)
-	}
-}
-
 var version string = "0.8.7"
 var buildInfo string = ""
 
@@ -66,7 +43,7 @@ func main() {
 		os.Exit(0)
 	}
 
-	go loxiXsyncMain()
+	go ln.LoxiXsyncMain()
 	// Need some time for RPC Handler to be up
 	time.Sleep(2 * time.Second)