[svn-commits] russell: branch russell/ast_verbose_threadstorage r38390 - /team/russell/ast_...

[svn-commits at lists.digium.com]

Author: russell
Date: Thu Jul 27 18:36:44 2006
New Revision: 38390

URL: http://svn.digium.com/view/asterisk?rev=38390&view=rev
Log:
move the registration of the console verboser to before any calls to 
ast_verbose to remove the need for the verbose message queue that has already
been removed

Modified:
    team/russell/ast_verbose_threadstorage/asterisk.c

Modified: team/russell/ast_verbose_threadstorage/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/russell/ast_verbose_threadstorage/asterisk.c?rev=38390&r1=38389&r2=38390&view=diff
==============================================================================
--- team/russell/ast_verbose_threadstorage/asterisk.c (original)
+++ team/russell/ast_verbose_threadstorage/asterisk.c Thu Jul 27 18:36:44 2006
@@ -2409,6 +2409,16 @@
 		}
 	}
 
+	if (ast_opt_console || option_verbose || (ast_opt_remote && !ast_opt_exec))
+		ast_register_verbose(console_verboser);
+
+	/* Print a welcome message if desired */
+	if (option_verbose || ast_opt_console)
+		WELCOME_MESSAGE;
+
+	if (ast_opt_console && !option_verbose) 
+		ast_verbose("[ Booting...");
+
 	if (ast_opt_always_fork && (ast_opt_remote || ast_opt_console)) {
 		ast_log(LOG_WARNING, "'alwaysfork' is not compatible with console or remote console mode; ignored\n");
 		ast_clear_flag(&ast_options, AST_OPT_FLAG_ALWAYS_FORK);
@@ -2530,7 +2540,6 @@
 				exit(0);
 			}
 			printf(term_quit());
-			ast_register_verbose(console_verboser);
 			WELCOME_MESSAGE;
 			ast_remotecontrol(NULL);
 			quit_handler(0, 0, 0, 0);
@@ -2579,15 +2588,6 @@
 	sigaddset(&sigs, SIGPIPE);
 	sigaddset(&sigs, SIGWINCH);
 	pthread_sigmask(SIG_BLOCK, &sigs, NULL);
-	if (ast_opt_console || option_verbose || ast_opt_remote)
-		ast_register_verbose(console_verboser);
-	/* Print a welcome message if desired */
-	if (option_verbose || ast_opt_console) {
-		WELCOME_MESSAGE;
-	}
-	if (ast_opt_console && !option_verbose) 
-		ast_verbose("[ Booting...");
-
 	signal(SIGURG, urg_handler);
 	signal(SIGINT, __quit_handler);
 	signal(SIGTERM, __quit_handler);