From 4ffa12a0b45a12985f6a3c9f8af67dc4c491f6c1 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Mon, 11 Nov 2019 08:52:18 +0200 Subject: [PATCH] Fixed typos --- engine/datamanager.go | 2 +- services/datadb.go | 1 - servmanager/servmanager.go | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/engine/datamanager.go b/engine/datamanager.go index 36301d0df..54b823b3b 100644 --- a/engine/datamanager.go +++ b/engine/datamanager.go @@ -2048,7 +2048,7 @@ func (dm *DataManager) SetLoadIDs(loadIDs map[string]int64) (err error) { return } -// Reconnect recconnects to the DB when the config was changes +// Reconnect recconnects to the DB when the config was changed func (dm *DataManager) Reconnect(marshaler string, newcfg *config.DataDbCfg) (err error) { d, err := NewDataDBConn(newcfg.DataDbType, newcfg.DataDbHost, newcfg.DataDbPort, newcfg.DataDbName, newcfg.DataDbUser, newcfg.DataDbPass, marshaler, newcfg.DataDbSentinelName) diff --git a/services/datadb.go b/services/datadb.go index b6e602cc3..8a584547c 100644 --- a/services/datadb.go +++ b/services/datadb.go @@ -117,7 +117,6 @@ func (db *DataDBService) Reload() (err error) { db.Lock() defer db.Unlock() if db.needsConnectionReload() { - // db.db.DataDB().Close() // already closed in reconnect if err = db.db.Reconnect(db.cfg.GeneralCfg().DBDataEncoding, db.cfg.DataDbCfg()); err != nil { return } diff --git a/servmanager/servmanager.go b/servmanager/servmanager.go index e3580ad64..0c933bd78 100644 --- a/servmanager/servmanager.go +++ b/servmanager/servmanager.go @@ -315,20 +315,20 @@ func (srvMngr *ServiceManager) reloadService(srviceName string) (err error) { if srv.ShouldRun() { if srv.IsRunning() { if err = srv.Reload(); err != nil { - utils.Logger.Err(fmt.Sprintf("<%s> Failed to reload <%s> because: %s", utils.ServiceManager, srv.ServiceName(), err)) + utils.Logger.Err(fmt.Sprintf("<%s> failed to reload <%s> err <%s>", utils.ServiceManager, srv.ServiceName(), err)) srvMngr.engineShutdown <- true return // stop if we encounter an error } } else { if err = srv.Start(); err != nil { - utils.Logger.Err(fmt.Sprintf("<%s> Failed to start <%s> because: %s", utils.ServiceManager, srv.ServiceName(), err)) + utils.Logger.Err(fmt.Sprintf("<%s> failed to start <%s> err <%s>", utils.ServiceManager, srv.ServiceName(), err)) srvMngr.engineShutdown <- true return // stop if we encounter an error } } } else if srv.IsRunning() { if err = srv.Shutdown(); err != nil { - utils.Logger.Err(fmt.Sprintf("<%s> Failed to stop service <%s> because: %s", utils.ServiceManager, srv.ServiceName(), err)) + utils.Logger.Err(fmt.Sprintf("<%s> failed to stop service <%s> err <%s>", utils.ServiceManager, srv.ServiceName(), err)) srvMngr.engineShutdown <- true return // stop if we encounter an error }