ing

server/server.go

@@ -1,18 +1,44 @@
 package server
 
 import (
+	"reflect"
+
+	cdr "git.loafle.net/commons_go/di/registry"
+	"git.loafle.net/commons_go/logging"
 	crr "git.loafle.net/commons_go/rpc/registry"
 	"git.loafle.net/commons_go/server"
+	ooca "git.loafle.net/overflow/overflow_commons_go/annotation"
 	oopcs "git.loafle.net/overflow/overflow_probe_container/server"
-	"git.loafle.net/overflow/overflow_probe_container_network/service"
+	oopcService "git.loafle.net/overflow/overflow_probe_container/service"
+	oopcns "git.loafle.net/overflow/overflow_probe_container_network/service"
 )
 
 func New(pidPath string) server.Server {
+	var (
+		services     []interface{}
+		probeService *oopcService.ProbeService
+		err          error
+	)
+	oopcns.InitService()
+
 	rpcRegistry := crr.NewRPCRegistry()
-	service.RegisterRPC(rpcRegistry)
+
+	if services, err = cdr.GetInstancesByAnnotationName(ooca.ServiceTag); nil != err {
+		logging.Logger().Panic(err)
+	}
+
+	for _, s := range services {
+		rpcRegistry.RegisterService(s, "")
+	}
+
+	if _probeService, err := cdr.GetInstance(reflect.TypeOf((*oopcService.ProbeService)(nil))); nil != err {
+		logging.Logger().Panic(err)
+	} else {
+		probeService = _probeService.(*oopcService.ProbeService)
+	}
 
 	rpcSH := oopcs.NewRPCServletHandler(rpcRegistry)
-	socketHandler := newSocketHandler(rpcSH)
+	socketHandler := newSocketHandler(rpcSH, probeService)
 
 	sh := newServerHandler(pidPath, socketHandler)
 	s := oopcs.New(sh)

server/socket_handlers.go

@@ -5,11 +5,12 @@ import (
 
 	"git.loafle.net/commons_go/server"
 	oopcs "git.loafle.net/overflow/overflow_probe_container/server"
+	oopcService "git.loafle.net/overflow/overflow_probe_container/service"
 )
 
-func newSocketHandler(rpcSH oopcs.RPCServletHandler) SocketHandler {
+func newSocketHandler(rpcSH oopcs.RPCServletHandler, probeService *oopcService.ProbeService) SocketHandler {
 	sh := &SocketHandlers{}
-	sh.SocketHandler = oopcs.NewSocketHandler(rpcSH)
+	sh.SocketHandler = oopcs.NewSocketHandler(rpcSH, probeService)
 
 	return sh
 }