From a706ca09ff804fac98dae20d1c2af914b9d64bb2 Mon Sep 17 00:00:00 2001 From: DanB Date: Mon, 3 Oct 2016 15:56:30 +0200 Subject: [PATCH] Configuration helper message for errors on parsing files, renamed tutorials/asterisk_events into tutorials/asterisk_ari --- config/config.go | 2 ++ .../asterisk/etc/asterisk/README | 0 .../asterisk/etc/asterisk/ari.conf | 0 .../asterisk/etc/asterisk/asterisk.conf | 0 .../asterisk/etc/asterisk/cdr.conf | 0 .../asterisk/etc/asterisk/cdr_custom.conf | 0 .../asterisk/etc/asterisk/confbridge.conf | 0 .../asterisk/etc/asterisk/extensions.conf | 0 .../asterisk/etc/asterisk/http.conf | 0 .../asterisk/etc/asterisk/indications.conf | 0 .../asterisk/etc/asterisk/logger.conf | 0 .../asterisk/etc/asterisk/manager.conf | 0 .../asterisk/etc/asterisk/modules.conf | 0 .../asterisk/etc/asterisk/musiconhold.conf | 0 .../asterisk/etc/asterisk/pjsip.conf | 0 .../asterisk/etc/asterisk/queues.conf | 0 .../asterisk/etc/asterisk/voicemail.conf | 0 .../asterisk/etc/init.d/asterisk | 0 .../cgrates/etc/cgrates/cgrates.json | 0 .../cgrates/etc/init.d/cgrates | 0 20 files changed, 2 insertions(+) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/README (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/ari.conf (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/asterisk.conf (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/cdr.conf (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/cdr_custom.conf (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/confbridge.conf (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/extensions.conf (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/http.conf (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/indications.conf (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/logger.conf (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/manager.conf (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/modules.conf (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/musiconhold.conf (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/pjsip.conf (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/queues.conf (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/asterisk/voicemail.conf (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/asterisk/etc/init.d/asterisk (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/cgrates/etc/cgrates/cgrates.json (100%) rename data/tutorials/{asterisk_events => asterisk_ari}/cgrates/etc/init.d/cgrates (100%) diff --git a/config/config.go b/config/config.go index 4b0d4192f..d0f40be7f 100644 --- a/config/config.go +++ b/config/config.go @@ -152,8 +152,10 @@ func NewCGRConfigFromFolder(cfgDir string) (*CGRConfig, error) { } for _, jsonFilePath := range cfgFiles { if cgrJsonCfg, err := NewCgrJsonCfgFromFile(jsonFilePath); err != nil { + utils.Logger.Err(fmt.Sprintf(" Error <%s> reading config from path: <%s>", err.Error(), jsonFilePath)) return err } else if err := cfg.loadFromJsonCfg(cgrJsonCfg); err != nil { + utils.Logger.Err(fmt.Sprintf(" Error <%s> loading config from path: <%s>", err.Error(), jsonFilePath)) return err } } diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/README b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/README similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/README rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/README diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/ari.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/ari.conf similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/ari.conf rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/ari.conf diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/asterisk.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/asterisk.conf similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/asterisk.conf rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/asterisk.conf diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/cdr.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/cdr.conf similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/cdr.conf rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/cdr.conf diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/cdr_custom.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/cdr_custom.conf similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/cdr_custom.conf rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/cdr_custom.conf diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/confbridge.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/confbridge.conf similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/confbridge.conf rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/confbridge.conf diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/extensions.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/extensions.conf similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/extensions.conf rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/extensions.conf diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/http.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/http.conf similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/http.conf rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/http.conf diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/indications.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/indications.conf similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/indications.conf rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/indications.conf diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/logger.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/logger.conf similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/logger.conf rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/logger.conf diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/manager.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/manager.conf similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/manager.conf rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/manager.conf diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/modules.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/modules.conf similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/modules.conf rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/modules.conf diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/musiconhold.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/musiconhold.conf similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/musiconhold.conf rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/musiconhold.conf diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/pjsip.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/pjsip.conf similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/pjsip.conf rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/pjsip.conf diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/queues.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/queues.conf similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/queues.conf rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/queues.conf diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/voicemail.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/voicemail.conf similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/asterisk/voicemail.conf rename to data/tutorials/asterisk_ari/asterisk/etc/asterisk/voicemail.conf diff --git a/data/tutorials/asterisk_events/asterisk/etc/init.d/asterisk b/data/tutorials/asterisk_ari/asterisk/etc/init.d/asterisk similarity index 100% rename from data/tutorials/asterisk_events/asterisk/etc/init.d/asterisk rename to data/tutorials/asterisk_ari/asterisk/etc/init.d/asterisk diff --git a/data/tutorials/asterisk_events/cgrates/etc/cgrates/cgrates.json b/data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json similarity index 100% rename from data/tutorials/asterisk_events/cgrates/etc/cgrates/cgrates.json rename to data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json diff --git a/data/tutorials/asterisk_events/cgrates/etc/init.d/cgrates b/data/tutorials/asterisk_ari/cgrates/etc/init.d/cgrates similarity index 100% rename from data/tutorials/asterisk_events/cgrates/etc/init.d/cgrates rename to data/tutorials/asterisk_ari/cgrates/etc/init.d/cgrates