LumeWeb
/
portal
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

fix: no need for singleton hack, use Replace not Decorate

This commit is contained in:
Derrick Hammer 2024-01-31 22:51:51 -05:00
parent 9a87004f31
commit 95cfa393b4
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
protocols/s5/s5.go
View File

@ -23,7 +23,6 @@ import (
var ( var (
_ s5storage.ProviderStore = (*S5ProviderStore)(nil) _ s5storage.ProviderStore = (*S5ProviderStore)(nil)
_ registry.Protocol = (*S5Protocol)(nil) _ registry.Protocol = (*S5Protocol)(nil)
instance *S5ProtocolResult
) )
type S5Protocol struct { type S5Protocol struct {
@ -54,7 +53,7 @@ type S5ProtocolResult struct {
var ProtocolModule = fx.Module("s5_api", var ProtocolModule = fx.Module("s5_api",
fx.Provide(NewS5Protocol), fx.Provide(NewS5Protocol),
fx.Provide(NewS5ProviderStore), fx.Provide(NewS5ProviderStore),
fx.Decorate(func(cfg *s5config.NodeConfig) *zap.Logger { fx.Replace(func(cfg *s5config.NodeConfig) *zap.Logger {
return cfg.Logger return cfg.Logger
}), }),
s5fx.Module, s5fx.Module,
@ -63,9 +62,6 @@ var ProtocolModule = fx.Module("s5_api",
func NewS5Protocol( func NewS5Protocol(
params S5ProtocolParams, params S5ProtocolParams,
) (S5ProtocolResult, error) { ) (S5ProtocolResult, error) {
if instance != nil {
return *instance, nil
}
proto := &S5Protocol{ proto := &S5Protocol{
config: params.Config, config: params.Config,
logger: params.Logger, logger: params.Logger,
@ -78,14 +74,12 @@ func NewS5Protocol(
return S5ProtocolResult{}, err return S5ProtocolResult{}, err
} }
instance = &S5ProtocolResult{ return S5ProtocolResult{
Protocol: proto, Protocol: proto,
S5Protocol: proto, S5Protocol: proto,
S5NodeConfig: cfg, S5NodeConfig: cfg,
Db: cfg.DB, Db: cfg.DB,
} }, nil
return *instance, nil
} }
func ConfigureS5Protocol(params S5ProtocolParams) (*s5config.NodeConfig, error) { func ConfigureS5Protocol(params S5ProtocolParams) (*s5config.NodeConfig, error) {