diff --git a/construct.go b/construct.go index 96fd43a..498da0b 100644 --- a/construct.go +++ b/construct.go @@ -21,8 +21,6 @@ import ( "github.com/tidwall/gjson" - "github.com/go-developer/websocket/storage" - "github.com/go-developer/websocket/context" "gopkg.in/olahol/melody.v1" @@ -140,8 +138,8 @@ func NewWebsocketServe(wsInstanceList ...abstract.IWebsocket) error { ctx := ctxInterface.(*context.WSContext) ctx.Session = session if err := wsInstance.Connect(ctx); nil == err { - if ginRouterTable[wsInstance.GetServerPort()].conf.StoreConnection && nil != storage.Connection { - storage.Connection.Store(ctx) + if ginRouterTable[wsInstance.GetServerPort()].conf.StoreConnection && nil != ginRouterTable[wsInstance.GetServerPort()].conf.ConnectionManager { + ginRouterTable[wsInstance.GetServerPort()].conf.ConnectionManager.Store(ctx) } } }) @@ -157,10 +155,10 @@ func NewWebsocketServe(wsInstanceList ...abstract.IWebsocket) error { ctxInterface, _ := session.Get("ws_context") ctx := ctxInterface.(*context.WSContext) defer func() { - if !ginRouterTable[wsInstance.GetServerPort()].conf.StoreConnection || nil == storage.Connection { + if !ginRouterTable[wsInstance.GetServerPort()].conf.StoreConnection || nil == ginRouterTable[wsInstance.GetServerPort()].conf.ConnectionManager { return } - storage.Connection.Del(ctx) + ginRouterTable[wsInstance.GetServerPort()].conf.ConnectionManager.Del(ctx) }() return wsInstance.Close(ctx, i, s) }) @@ -169,10 +167,10 @@ func NewWebsocketServe(wsInstanceList ...abstract.IWebsocket) error { ctxInterface, _ := session.Get("ws_context") ctx := ctxInterface.(*context.WSContext) defer func() { - if nil == storage.Connection { + if nil == ginRouterTable[wsInstance.GetServerPort()].conf.ConnectionManager { return } - storage.Connection.Del(ctx) + ginRouterTable[wsInstance.GetServerPort()].conf.ConnectionManager.Del(ctx) }() wsInstance.Disconnect(ctx) })