diff options
| author | Olle Johansson <oej@edvina.net> | 2011-09-19 12:20:44 +0000 |
|---|---|---|
| committer | Olle Johansson <oej@edvina.net> | 2011-09-19 12:20:44 +0000 |
| commit | cab155e437ed7563d55262f6440c5a18cf80d9c6 (patch) | |
| tree | 2d79339ab415ee2c96b1e3e8d9757cd6f96c3e14 /main | |
| parent | 5b4b76d3aac25dad2f5fa4e5da7a18b668c59a26 (diff) | |
Merged revisions 336441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r336441 | oej | 2011-09-19 14:15:06 +0200 (Mån, 19 Sep 2011) | 9 lines
Merged revisions 336440 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r336440 | oej | 2011-09-19 14:06:48 +0200 (Mån, 19 Sep 2011) | 2 lines
Make sure manager_debug option is reset at reload
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336453 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c index f25c6b516..c5f973dd7 100644 --- a/main/manager.c +++ b/main/manager.c @@ -922,6 +922,7 @@ static int httptimeout = 60; static int broken_events_action = 0; static int manager_enabled = 0; static int webmanager_enabled = 0; +static int manager_debug = 0; /*!< enable some debugging code in the manager */ static int authtimeout; static int authlimit; static char *manager_channelvars; @@ -932,7 +933,6 @@ static char global_realm[MAXHOSTNAMELEN]; /*!< Default realm */ static int block_sockets; static int unauth_sessions = 0; -static int manager_debug; /*!< enable some debugging code in the manager */ /*! \brief * Descriptor for a manager session, either on the AMI socket or over HTTP. @@ -6445,6 +6445,8 @@ static int __init_manager(int reload) broken_events_action = 0; authtimeout = 30; authlimit = 50; + manager_debug = 0; /* Debug disabled by default */ + if (!cfg || cfg == CONFIG_STATUS_FILEINVALID) { ast_log(LOG_NOTICE, "Unable to open AMI configuration manager.conf, or configuration is invalid. Asterisk management interface (AMI) disabled.\n"); return 0; |