Covered loaderscfg to 100%

config/config.go

@@ -39,14 +39,13 @@ import (
 )
 
 var (
-	dbDefaultsCfg            dbDefaults
-	cgrCfg                   *CGRConfig  // will be shared
-	dfltFsConnConfig         *FsConnCfg  // Default FreeSWITCH Connection configuration, built out of json default configuration
-	dfltKamConnConfig        *KamConnCfg // Default Kamailio Connection configuration
-	dfltRemoteHost           *RemoteHost
-	dfltAstConnCfg           *AsteriskConnCfg
-	dfltLoaderConfig         *LoaderSCfg
-	dfltLoaderDataTypeConfig *LoaderDataType
+	dbDefaultsCfg     dbDefaults
+	cgrCfg            *CGRConfig  // will be shared
+	dfltFsConnConfig  *FsConnCfg  // Default FreeSWITCH Connection configuration, built out of json default configuration
+	dfltKamConnConfig *KamConnCfg // Default Kamailio Connection configuration
+	dfltRemoteHost    *RemoteHost
+	dfltAstConnCfg    *AsteriskConnCfg
+	dfltLoaderConfig  *LoaderSCfg
 )
 
 func newDbDefaults() dbDefaults {
@@ -221,6 +220,8 @@ func NewDefaultCGRConfig() (cfg *CGRConfig, err error) {
 	dfltKamConnConfig = cfg.kamAgentCfg.EvapiConns[0]
 	dfltAstConnCfg = cfg.asteriskAgentCfg.AsteriskConns[0]
 	dfltLoaderConfig = cfg.loaderCfg[0].Clone()
+	dfltRemoteHost = new(RemoteHost)
+	*dfltRemoteHost = *cfg.rpcConns[utils.MetaLocalHost].Conns[0]
 	err = cfg.checkConfigSanity()
 	return
 }

config/loaderscfg.go

@@ -68,14 +68,6 @@ type LoaderSCfg struct {
 	Data           []*LoaderDataType
 }
 
-func NewDfltLoaderDataTypeConfig() *LoaderDataType {
-	if dfltLoaderDataTypeConfig == nil {
-		return new(LoaderDataType) // No defaults, most probably we are building the defaults now
-	}
-	dfltVal := *dfltLoaderDataTypeConfig // Copy the value instead of it's pointer
-	return &dfltVal
-}
-
 type LoaderDataType struct { //rename to LoaderDataType
 	Type     string
 	Filename string
@@ -156,7 +148,7 @@ func (self *LoaderSCfg) loadFromJsonCfg(jsnCfg *LoaderJsonCfg, msgTemplates map[
 	if jsnCfg.Data != nil {
 		data := make([]*LoaderDataType, len(*jsnCfg.Data))
 		for idx, jsnLoCfg := range *jsnCfg.Data {
-			data[idx] = NewDfltLoaderDataTypeConfig()
+			data[idx] = new(LoaderDataType)
 			if err := data[idx].loadFromJsonCfg(jsnLoCfg, msgTemplates, separator); err != nil {
 				return err
 			}