From 0538c652d41ef31fbd08636072810dd7c5a001f4 Mon Sep 17 00:00:00 2001 From: porosnicuadrian Date: Wed, 27 Jan 2021 18:03:44 +0200 Subject: [PATCH] Splited Handler func + removed BiRPCRegister func --- cores/server.go | 12 ++++++------ utils/net.go | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cores/server.go b/cores/server.go index c71c035a4..1b8dac6ef 100644 --- a/cores/server.go +++ b/cores/server.go @@ -229,9 +229,7 @@ func (s *Server) ServeHTTP(addr string, jsonRPCURL string, wsRPCURL string, s.httpEnabled = true s.Unlock() utils.Logger.Info(" enabling handler for WebSocket connections") - wsHandler := websocket.Handler(func(ws *websocket.Conn) { - rpc.ServeCodec(newCapsJSONCodec(ws, s.caps, s.anz)) - }) + wsHandler := websocket.Handler(s.handleWebSocket) if useBasicAuth { s.httpMux.HandleFunc(wsRPCURL, use(wsHandler.ServeHTTP, basicAuth(userList))) } else { @@ -413,6 +411,10 @@ func (s *Server) ServeJSONTLS(addr, serverCrt, serverKey, caCert string, s.serveCodecTLS(addr, utils.JSONCaps, serverCrt, serverKey, caCert, serverPolicy, serverName, newCapsJSONCodec, shdChan) } +func (s *Server) handleWebSocket(ws *websocket.Conn) { + rpc.ServeCodec(newCapsJSONCodec(ws, s.caps, s.anz)) +} + func (s *Server) ServeHTTPTLS(addr, serverCrt, serverKey, caCert string, serverPolicy int, serverName string, jsonRPCURL string, wsRPCURL string, useBasicAuth bool, userList map[string]string, shdChan *utils.SyncedChan) { @@ -438,9 +440,7 @@ func (s *Server) ServeHTTPTLS(addr, serverCrt, serverKey, caCert string, serverP s.httpEnabled = true s.Unlock() utils.Logger.Info(" enabling handler for WebSocket connections") - wsHandler := websocket.Handler(func(ws *websocket.Conn) { - rpc.ServeCodec(newCapsJSONCodec(ws, s.caps, s.anz)) - }) + wsHandler := websocket.Handler(s.handleWebSocket) if useBasicAuth { s.httpsMux.HandleFunc(wsRPCURL, use(wsHandler.ServeHTTP, basicAuth(userList))) } else { diff --git a/utils/net.go b/utils/net.go index 3db151dfe..982ecc961 100644 --- a/utils/net.go +++ b/utils/net.go @@ -34,7 +34,6 @@ type Server interface { RegisterHttpFunc(pattern string, handler func(http.ResponseWriter, *http.Request)) RegisterHttpHandler(pattern string, handler http.Handler) BiRPCRegisterName(method string, handlerFunc interface{}) - BiRPCRegister(rcvr interface{}) } func LocalAddr() *NetAddr {