[asterisk-commits] rmudgett: branch rmudgett/ast_verb r405156 - in /team/rmudgett/ast_verb: func...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jan  8 13:40:40 2014
New Revision: 405156

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405156
Log:
Restore some previous uses of VERBOSITY_ATLEAST().

Modified:
    team/rmudgett/ast_verb/funcs/func_timeout.c
    team/rmudgett/ast_verb/main/manager.c
    team/rmudgett/ast_verb/main/pbx.c

Modified: team/rmudgett/ast_verb/funcs/func_timeout.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ast_verb/funcs/func_timeout.c?view=diff&rev=405156&r1=405155&r2=405156
==============================================================================
--- team/rmudgett/ast_verb/funcs/func_timeout.c (original)
+++ team/rmudgett/ast_verb/funcs/func_timeout.c Wed Jan  8 13:40:40 2014
@@ -156,13 +156,15 @@
 	case 'a':
 	case 'A':
 		ast_channel_setwhentohangup_tv(chan, when);
-		if (!ast_tvzero(*ast_channel_whentohangup(chan))) {
-			when = ast_tvadd(when, ast_tvnow());
-			ast_strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S.%3q %Z",
-				ast_localtime(&when, &myt, NULL));
-			ast_verb(3, "Channel will hangup at %s.\n", timestr);
-		} else {
-			ast_verb(3, "Channel hangup cancelled.\n");
+		if (VERBOSITY_ATLEAST(3)) {
+			if (!ast_tvzero(*ast_channel_whentohangup(chan))) {
+				when = ast_tvadd(when, ast_tvnow());
+				ast_strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S.%3q %Z",
+					ast_localtime(&when, &myt, NULL));
+				ast_verb(3, "Channel will hangup at %s.\n", timestr);
+			} else {
+				ast_verb(3, "Channel hangup cancelled.\n");
+			}
 		}
 		break;
 

Modified: team/rmudgett/ast_verb/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ast_verb/main/manager.c?view=diff&rev=405156&r1=405155&r2=405156
==============================================================================
--- team/rmudgett/ast_verb/main/manager.c (original)
+++ team/rmudgett/ast_verb/main/manager.c Wed Jan  8 13:40:40 2014
@@ -1588,13 +1588,13 @@
  *  \param session manager session to get parameter from.
  *  \return displayconnects config option value.
  */
-static int manager_displayconnects (struct mansession_session *session)
+static int manager_displayconnects(struct mansession_session *session)
 {
 	struct ast_manager_user *user = NULL;
 	int ret = 0;
 
 	AST_RWLIST_RDLOCK(&users);
-	if ((user = get_manager_by_name_locked (session->username))) {
+	if ((user = get_manager_by_name_locked(session->username))) {
 		ret = user->displayconnects;
 	}
 	AST_RWLIST_UNLOCK(&users);
@@ -5581,7 +5581,9 @@
 	while ((session = ao2_iterator_next(&i)) && n_max > 0) {
 		ao2_lock(session);
 		if (session->sessiontimeout && (now > session->sessiontimeout) && !session->inuse) {
-			if (session->authenticated && manager_displayconnects(session)) {
+			if (session->authenticated
+				&& VERBOSITY_ATLEAST(2)
+				&& manager_displayconnects(session)) {
 				ast_verb(2, "HTTP Manager '%s' timed out from %s\n",
 					session->username, ast_sockaddr_stringify_addr(&session->addr));
 			}

Modified: team/rmudgett/ast_verb/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ast_verb/main/pbx.c?view=diff&rev=405156&r1=405155&r2=405156
==============================================================================
--- team/rmudgett/ast_verb/main/pbx.c (original)
+++ team/rmudgett/ast_verb/main/pbx.c Wed Jan  8 13:40:40 2014
@@ -4884,7 +4884,7 @@
 			ast_channel_trace_update(c);
 #endif
 			ast_debug(1, "Launching '%s'\n", app->name);
-			{
+			if (VERBOSITY_ATLEAST(3)) {
 				char tmp[80], tmp2[80], tmp3[EXT_DATA_SIZE];
 				ast_verb(3, "Executing [%s@%s:%d] %s(\"%s\", \"%s\") %s\n",
 					exten, context, priority,