uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Updated loadConfigFromReader

Browse Source
This commit is contained in:
Trial97
2019-08-30 17:40:01 +03:00
committed by Dan Christian Bogos
parent 35e0350421
commit 8bf4ea02e5
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
config/config.go
View File

@@ -19,10 +19,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package config
import (
"bytes"
"encoding/json"
"errors"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/url"
"os"
@@ -1466,7 +1468,7 @@ func (cfg *CGRConfig) V1ReloadConfig(args *ConfigReloadWithArgDispatcher, reply
return utils.NewErrMandatoryIeMissing(missing...)
}
if err = cfg.loadConfig(args.Path, args.Section); err != nil {
return err
return
}
// lock all sections
cfg.rLockSections()
@@ -1476,11 +1478,11 @@ func (cfg *CGRConfig) V1ReloadConfig(args *ConfigReloadWithArgDispatcher, reply
cfg.rUnlockSections() // unlock before checking the error
if err != nil {
return err
return
}
if err = cfg.reloadSection(args.Section); err != nil {
return err
return
}
*reply = utils.OK
return
@@ -1530,13 +1532,17 @@ func (cfg *CGRConfig) loadConfig(path, section string) (err error) {
}
func (_ *CGRConfig) loadConfigFromReader(rdr io.Reader, loadFuncs []func(jsnCfg *CgrJsonCfg) error) (err error) {
b, err := ioutil.ReadAll(rdr)
if err != nil {
return
}
var jsnCfg *CgrJsonCfg
if jsnCfg, err = NewCgrJsonCfgFromReader(rdr); err != nil {
return err // should handle the json error
if jsnCfg, err = NewCgrJsonCfgFromReader(bytes.NewReader(b)); err != nil { // for the moment we dont't check the error in the rjreader
return HandleJSONError(bytes.NewReader(b), err)
}
for _, loadFunc := range loadFuncs {
if err := loadFunc(jsnCfg); err != nil {
return err
if err = loadFunc(jsnCfg); err != nil {
return
}
}
return
@@ -1552,7 +1558,7 @@ func (cfg *CGRConfig) loadConfigFromPath(path string, loadFuncs []func(jsnCfg *C
if os.IsNotExist(err) {
return utils.ErrPathNotReachable(path)
}
return err
return
} else if !fi.IsDir() && path != utils.CONFIG_PATH { // If config dir defined, needs to exist, not checking for default
return fmt.Errorf("Path: %s not a directory.", path)
}
@@ -1579,20 +1585,21 @@ func (cfg *CGRConfig) loadConfigFromFolder(cfgDir string, loadFuncs []func(jsnCf
jsonFilesFound = true
}
for _, jsonFilePath := range cfgFiles {
cfgFile, err := os.Open(jsonFilePath)
if err != nil {
return err
}
err = cfg.loadConfigFromReader(cfgFile, loadFuncs)
cfgFile.Close()
if err != nil {
return err
var cfgFile *os.File
cfgFile, werr = os.Open(jsonFilePath)
if werr != nil {
return
}
werr = cfg.loadConfigFromReader(cfgFile, loadFuncs)
cfgFile.Close()
if werr != nil {
return
}
}
return
}); err != nil {
return err
return
}
if !jsonFilesFound {
return fmt.Errorf("No config file found on path %s", cfgDir)