diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-08-16 21:09:46 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-08-16 21:09:46 +0000 |
commit | 56b9568164b694a42e88f1f8a31012078b833203 (patch) | |
tree | 8fda811f62cb6ffb99847befb7b74b1519ea95ba /main/cdr.c | |
parent | c0060cd99a0a318b504da4c13eee85f3b9043fdc (diff) |
Don't reload a configuration file if nothing has changed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/cdr.c')
-rw-r--r-- | main/cdr.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/main/cdr.c b/main/cdr.c index 6f0d75aab..6cbb52f7e 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -1281,7 +1281,7 @@ static struct ast_cli_entry cli_status = { " Displays the Call Detail Record engine system status.\n" }; -static int do_reload(void) +static int do_reload(int reload) { struct ast_config *config; const char *enabled_value; @@ -1296,6 +1296,10 @@ static int do_reload(void) int was_enabled; int was_batchmode; int res=0; + struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; + + if ((config = ast_config_load("cdr.conf", config_flags)) == CONFIG_STATUS_FILEUNCHANGED) + return 0; ast_mutex_lock(&cdr_batch_lock); @@ -1312,7 +1316,7 @@ static int do_reload(void) if (cdr_sched > -1) ast_sched_del(sched, cdr_sched); - if ((config = ast_config_load("cdr.conf"))) { + if (config) { if ((enabled_value = ast_variable_retrieve(config, "general", "enable"))) { enabled = ast_true(enabled_value); } @@ -1405,7 +1409,7 @@ int ast_cdr_engine_init(void) ast_cli_register(&cli_status); - res = do_reload(); + res = do_reload(0); if (res) { ast_mutex_lock(&cdr_batch_lock); res = init_batch(); @@ -1424,6 +1428,6 @@ void ast_cdr_engine_term(void) int ast_cdr_engine_reload(void) { - return do_reload(); + return do_reload(1); } |