From cb2585837a986c81983a4bf87f237e5c648001f6 Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Thu, 1 Apr 2021 17:53:17 +0300 Subject: [PATCH] Refactor RegisterHTTPFunc --- cmd/cgr-engine/cgr-engine.go | 4 ++-- cores/server_test.go | 4 ++-- engine/cdrs.go | 4 ++-- utils/net.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index 74b28d8b5..494f2a9bb 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -584,10 +584,10 @@ func main() { // Rpc/http server server := cores.NewServer(caps) if len(cfg.HTTPCfg().RegistrarSURL) != 0 { - server.RegisterHttpFunc(cfg.HTTPCfg().RegistrarSURL, registrarc.Registrar) + server.RegisterHTTPFunc(cfg.HTTPCfg().RegistrarSURL, registrarc.Registrar) } if cfg.ConfigSCfg().Enabled { - server.RegisterHttpFunc(cfg.ConfigSCfg().URL, config.HandlerConfigS) + server.RegisterHTTPFunc(cfg.ConfigSCfg().URL, config.HandlerConfigS) } if *httpPprofPath != utils.EmptyString { server.RegisterProfiler(*httpPprofPath) diff --git a/cores/server_test.go b/cores/server_test.go index fdca3b089..cd3b0e5bd 100644 --- a/cores/server_test.go +++ b/cores/server_test.go @@ -61,7 +61,7 @@ func TestNewServer(t *testing.T) { } } -func TestRegisterHttpFunc(t *testing.T) { +func TestRegisterHTTPFunc(t *testing.T) { log.SetOutput(io.Discard) cfgDflt := config.NewDefaultCGRConfig() cfgDflt.CoreSCfg().CapsStatsInterval = 1 @@ -83,7 +83,7 @@ func TestRegisterHttpFunc(t *testing.T) { handler := func(http.ResponseWriter, *http.Request) {} - rcv.RegisterHttpFunc("/home", handler) + rcv.RegisterHTTPFunc("/home", handler) rcv.RpcRegisterName(utils.EmptyString, handler) diff --git a/engine/cdrs.go b/engine/cdrs.go index 5d6e8af83..aea076c9e 100644 --- a/engine/cdrs.go +++ b/engine/cdrs.go @@ -128,8 +128,8 @@ func (cdrS *CDRServer) ListenAndServe(stopChan chan struct{}) { // RegisterHandlersToServer is called by cgr-engine to register HTTP URL handlers func (cdrS *CDRServer) RegisterHandlersToServer(server utils.Server) { - server.RegisterHttpFunc(cdrS.cgrCfg.HTTPCfg().HTTPCDRsURL, cdrS.cgrCdrHandler) - server.RegisterHttpFunc(cdrS.cgrCfg.HTTPCfg().HTTPFreeswitchCDRsURL, cdrS.fsCdrHandler) + server.RegisterHTTPFunc(cdrS.cgrCfg.HTTPCfg().HTTPCDRsURL, cdrS.cgrCdrHandler) + server.RegisterHTTPFunc(cdrS.cgrCfg.HTTPCfg().HTTPFreeswitchCDRsURL, cdrS.fsCdrHandler) } // chrgrSProcessEvent forks CGREventWithOpts into multiples based on matching ChargerS profiles diff --git a/utils/net.go b/utils/net.go index 00ed14e82..3fc8fb946 100644 --- a/utils/net.go +++ b/utils/net.go @@ -31,7 +31,7 @@ import ( type Server interface { RpcRegister(rcvr interface{}) RpcRegisterName(name string, rcvr interface{}) - RegisterHttpFunc(pattern string, handler func(http.ResponseWriter, *http.Request)) + RegisterHTTPFunc(pattern string, handler func(http.ResponseWriter, *http.Request)) RegisterHttpHandler(pattern string, handler http.Handler) BiRPCRegisterName(method string, handlerFunc interface{}) }