diff options
| author | Russell Bryant <russell@russellbryant.com> | 2011-05-05 23:02:11 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2011-05-05 23:02:11 +0000 |
| commit | 15b8740f803ed63c67badcfe2f4c1031a452c2fe (patch) | |
| tree | 74f77fca9c6978ad4f905f5387a431d847152afc /cdr | |
| parent | 09389749028acad555b469a36064df0d12304130 (diff) | |
Merged revisions 317480 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r317480 | russell | 2011-05-05 18:00:55 -0500 (Thu, 05 May 2011) | 8 lines
Don't lose cdr_syslog config on a reload.
(closes issue #18679)
Reported by: enegaard
Patches:
issue18679_seanbright.patch uploaded by seanbright (license 71)
Tested by: enegaard
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@317481 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'cdr')
| -rw-r--r-- | cdr/cdr_syslog.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cdr/cdr_syslog.c b/cdr/cdr_syslog.c index 6d9a6df3b..63545208e 100644 --- a/cdr/cdr_syslog.c +++ b/cdr/cdr_syslog.c @@ -264,8 +264,10 @@ static int reload(void) return AST_MODULE_LOAD_DECLINE; } - free_config(); - res = load_config(1); + if ((res = load_config(1))) { + free_config(); + } + AST_RWLIST_UNLOCK(&sinks); return res ? AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS; |