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/asterisk.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/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 118dd2982..052bf629d 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2290,13 +2290,14 @@ static void ast_readconfig(void) struct ast_variable *v; char *config = AST_CONFIG_FILE; char hostname[MAXHOSTNAMELEN] = ""; + struct ast_flags config_flags = { 0 }; if (ast_opt_override_config) { - cfg = ast_config_load(ast_config_AST_CONFIG_FILE); + cfg = ast_config_load(ast_config_AST_CONFIG_FILE, config_flags); if (!cfg) ast_log(LOG_WARNING, "Unable to open specified master config file '%s', using built-in defaults\n", ast_config_AST_CONFIG_FILE); } else - cfg = ast_config_load(config); + cfg = ast_config_load(config, config_flags); /* init with buildtime config */ ast_copy_string(ast_config_AST_CONFIG_DIR, AST_CONFIG_DIR, sizeof(ast_config_AST_CONFIG_DIR)); |