linters: Add modernise tool check and fix issues (#2012)

* linters: Add modernise tool check and fix issues

* engine: Simplify exch.SetDefaults call and remove localWG

* CI: Revert config versions lint workflow
This commit is contained in:
Adrian Gallagher
2025-08-26 12:45:13 +10:00
committed by GitHub
parent 85403fe801
commit d5b2cf1759
22 changed files with 103 additions and 159 deletions

View File

@@ -180,9 +180,7 @@ func (m *apiServerManager) StartRESTServer() error {
ReadHeaderTimeout: time.Minute,
}
}
m.wgRest.Add(1)
go func() {
defer m.wgRest.Done()
m.wgRest.Go(func() {
err := m.restHTTPServer.ListenAndServe()
if err != nil {
atomic.StoreInt32(&m.restStarted, 0)
@@ -190,7 +188,7 @@ func (m *apiServerManager) StartRESTServer() error {
log.Errorln(log.APIServerMgr, err)
}
}
}()
})
return nil
}
@@ -422,9 +420,7 @@ func (m *apiServerManager) StartWebsocketServer() error {
}
}
m.wgWebsocket.Add(1)
go func() {
defer m.wgWebsocket.Done()
m.wgWebsocket.Go(func() {
err := m.websocketHTTPServer.ListenAndServe()
if err != nil {
atomic.StoreInt32(&m.websocketStarted, 0)
@@ -432,7 +428,7 @@ func (m *apiServerManager) StartWebsocketServer() error {
log.Errorln(log.APIServerMgr, err)
}
}
}()
})
return nil
}

View File

@@ -731,12 +731,8 @@ func (bot *Engine) LoadExchange(name string) error {
return ErrExchangeFailedToLoad
}
var localWG sync.WaitGroup
localWG.Add(1)
go func() {
exch.SetDefaults()
localWG.Done()
}()
exch.SetDefaults()
exchCfg, err := bot.Config.GetExchangeConfig(name)
if err != nil {
return err
@@ -789,7 +785,6 @@ func (bot *Engine) LoadExchange(name string) error {
exchCfg.HTTPDebugging = bot.Settings.EnableExchangeHTTPDebugging
}
localWG.Wait()
if !bot.Settings.EnableExchangeHTTPRateLimiter {
err = exch.DisableRateLimiter()
if err != nil {

View File

@@ -134,19 +134,15 @@ func (m *WebsocketRoutineManager) websocketRoutine() {
continue
}
wg.Add(1)
go func() {
defer wg.Done()
err = m.websocketDataReceiver(ws)
if err != nil {
wg.Go(func() {
if err := m.websocketDataReceiver(ws); err != nil {
log.Errorf(log.WebsocketMgr, "%v", err)
}
err = ws.Connect()
if err != nil {
if err := ws.Connect(); err != nil {
log.Errorf(log.WebsocketMgr, "%v", err)
}
}()
})
}
wg.Wait()
}
@@ -166,9 +162,7 @@ func (m *WebsocketRoutineManager) websocketDataReceiver(ws *websocket.Manager) e
return errRoutineManagerNotStarted
}
m.wg.Add(1)
go func() {
defer m.wg.Done()
m.wg.Go(func() {
for {
select {
case <-m.shutdown:
@@ -187,7 +181,7 @@ func (m *WebsocketRoutineManager) websocketDataReceiver(ws *websocket.Manager) e
m.mu.RUnlock()
}
}
}()
})
return nil
}