[asterisk-commits] russell: branch 1.6.2 r288340 - in /branches/1.6.2: ./ main/asterisk.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Sep 22 11:44:13 2010
New Revision: 288340

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=288340
Log:
Merged revisions 288339 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r288339 | russell | 2010-09-22 11:39:16 -0500 (Wed, 22 Sep 2010) | 11 lines
  
  Fix a 100% CPU consumption problem when setting console=yes in asterisk.conf.
  
  The handling of -c and console=yes should be the same, but they were not.
  When you specify -c, it sets both a flag for console module and for asterisk
  not to fork() off into the background.  The handling of console=yes only set
  console mode, so you would end up with a background process() trying to run
  the Asterisk console and freaking out since it didn't have anything to read
  input from.
  
  Thanks to beagles for reporting and helping debug the problem!
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/asterisk.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/asterisk.c?view=diff&rev=288340&r1=288339&r2=288340
==============================================================================
--- branches/1.6.2/main/asterisk.c (original)
+++ branches/1.6.2/main/asterisk.c Wed Sep 22 11:44:13 2010
@@ -2933,7 +2933,7 @@
 			ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_QUIET);
 		/* Run as console (-c at startup, implies nofork) */
 		} else if (!strcasecmp(v->name, "console")) {
-			ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_CONSOLE);
+			ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_NO_FORK | AST_OPT_FLAG_CONSOLE);
 		/* Run with high priority if the O/S permits (-p at startup) */
 		} else if (!strcasecmp(v->name, "highpriority")) {
 			ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_HIGH_PRIORITY);