diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-04-01 10:59:32 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-04-01 10:59:32 +0000 |
| commit | 3731fd9ccce8d93a0bb22f8ba0db277652537335 (patch) | |
| tree | 3f7181612491fd8769545898d5097b44a500865d /addons/cdr_mysql.c | |
| parent | e59a051c3e94820f6b31f3781707f9e49506db8a (diff) | |
Merged revisions 312286,312288 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r312286 | tilghman | 2011-04-01 05:44:33 -0500 (Fri, 01 Apr 2011) | 2 lines
Reload must react correctly against a possibly changed table, so dropping the conditional reload flag.
................
r312288 | tilghman | 2011-04-01 05:58:45 -0500 (Fri, 01 Apr 2011) | 21 lines
Merged revisions 312287 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r312287 | tilghman | 2011-04-01 05:51:24 -0500 (Fri, 01 Apr 2011) | 14 lines
Merged revisions 312285 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r312285 | tilghman | 2011-04-01 05:36:42 -0500 (Fri, 01 Apr 2011) | 7 lines
Found some leaking file descriptors while looking at ast_FD_SETSIZE dead code.
(issue #18969)
Reported by: oej
Patches:
20110315__issue18969__14.diff.txt uploaded by tilghman (license 14)
........
................
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@312289 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'addons/cdr_mysql.c')
| -rw-r--r-- | addons/cdr_mysql.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c index 504163a21..167a5af58 100644 --- a/addons/cdr_mysql.c +++ b/addons/cdr_mysql.c @@ -428,7 +428,7 @@ static int my_load_module(int reload) int res; struct ast_config *cfg; struct ast_variable *var; - struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; + struct ast_flags config_flags = { 0 }; struct column *entry; char *temp; struct ast_str *compat; @@ -439,6 +439,9 @@ static int my_load_module(int reload) my_bool my_bool_true = 1; #endif + /* Cannot use a conditionally different flag, because the table layout may + * have changed, which is not detectable by config file change detection, + * but should still cause the configuration to be re-parsed. */ cfg = ast_config_load(config, config_flags); if (!cfg) { ast_log(LOG_WARNING, "Unable to load config for mysql CDR's: %s\n", config); |