mirror of
https://github.com/cgrates/cgrates.git
synced 2026-02-11 18:16:24 +05:00
Improving loadConfigFromHTTP redundant URL parse
This commit is contained in:
committed by
Dan Christian Bogos
parent
12447c3f49
commit
909f56d58a
@@ -26,7 +26,6 @@ import (
|
||||
"io"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
@@ -1350,9 +1349,6 @@ func (cfg *CGRConfig) loadConfigFromFile(jsonFilePath string, loadFuncs []func(j
|
||||
|
||||
func (cfg *CGRConfig) loadConfigFromHTTP(urlPaths string, loadFuncs []func(jsnCfg *CgrJsonCfg) error) (err error) {
|
||||
for _, urlPath := range strings.Split(urlPaths, utils.InfieldSep) {
|
||||
if _, err = url.ParseRequestURI(urlPath); err != nil {
|
||||
return
|
||||
}
|
||||
var myClient = &http.Client{
|
||||
Timeout: CgrConfig().GeneralCfg().ReplyTimeout,
|
||||
}
|
||||
|
||||
@@ -5551,16 +5551,6 @@ func TestCgrCfgJSONDefaultsConfigS(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoadConfigFromHTTP(t *testing.T) {
|
||||
cfgCgr := NewDefaultCGRConfig()
|
||||
|
||||
url := "inexistentURL"
|
||||
expected := "parse \"inexistentURL\": invalid URI for request"
|
||||
if err := cfgCgr.loadConfigFromHTTP(url, nil); err == nil || err.Error() != expected {
|
||||
t.Errorf("Expected %+v, received %+v", expected, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestReloadSections(t *testing.T) {
|
||||
subsystemsThatNeedDataDB := utils.NewStringSet([]string{SCHEDULER_JSN,
|
||||
RALS_JSN, CDRS_JSN, SessionSJson, ATTRIBUTE_JSN,
|
||||
|
||||
Reference in New Issue
Block a user