This commit is contained in:
shoopea
2025-12-28 16:31:28 +01:00
parent a1ed1035e9
commit d92380cccb
5 changed files with 29 additions and 24 deletions

View File

@@ -203,12 +203,14 @@ func LoadConfigByte(conf []byte) (*Config, error) {
}
// Pretty config
func (c *Config) Pretty() ([]byte, error) {
func (c *Config) Pretty(lock bool) ([]byte, error) {
log.WithFields(log.Fields{}).Debugf("starting")
defer log.WithFields(log.Fields{}).Debugf("done")
CfgLock()
defer CfgUnlock()
if lock {
CfgLock()
defer CfgUnlock()
}
b, err := json.Marshal(cfg)
if err != nil {
@@ -220,12 +222,14 @@ func (c *Config) Pretty() ([]byte, error) {
}
// Pretty App Config
func (a *AppConfig) Pretty() ([]byte, error) {
func (a *AppConfig) Pretty(lock bool) ([]byte, error) {
log.WithFields(log.Fields{}).Debugf("starting")
defer log.WithFields(log.Fields{}).Debugf("done")
CfgLock()
defer CfgUnlock()
if lock {
CfgLock()
defer CfgUnlock()
}
b, err := json.Marshal(a)
if err != nil {
@@ -237,11 +241,11 @@ func (a *AppConfig) Pretty() ([]byte, error) {
}
// Save config
func (c *Config) Save() error {
func (c *Config) Save(lock bool) error {
log.WithFields(log.Fields{}).Debugf("starting")
defer log.WithFields(log.Fields{}).Debugf("done")
r, err := cfg.Pretty()
r, err := cfg.Pretty(lock)
if err != nil {
log.WithFields(log.Fields{"error": err, "call": "cfg.Pretty"}).Errorf("")
return err
@@ -263,7 +267,7 @@ func (c *Config) Save() error {
}
// Run config
func (c *Config) Run() {
func (c *Config) Run(lock bool) {
log.WithFields(log.Fields{}).Debugf("starting")
defer log.WithFields(log.Fields{}).Debugf("done")
@@ -271,8 +275,10 @@ func (c *Config) Run() {
return
}
CfgLock()
defer CfgUnlock()
if lock {
CfgLock()
defer CfgUnlock()
}
cfgRun = true
defer func() { cfgRun = false }()