[asterisk-commits] oej: trunk r336453 - in /trunk: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Sep 19 07:20:44 2011
New Revision: 336453

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=336453
Log:
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
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/manager.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=336453&r1=336452&r2=336453
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Mon Sep 19 07:20:44 2011
@@ -922,6 +922,7 @@
 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 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 @@
 	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;