[svn-commits] russell: branch 1.6.1 r151907 - in /branches/1.6.1: ./ main/asterisk.c

[SVN commits to the Digium repositories]

Author: russell
Date: Sat Oct 25 06:11:25 2008
New Revision: 151907

URL: http://svn.digium.com/view/asterisk?view=rev&rev=151907
Log:
Merged revisions 151906 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r151906 | russell | 2008-10-25 06:02:11 -0500 (Sat, 25 Oct 2008) | 16 lines

Merged revisions 151905 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r151905 | russell | 2008-10-25 05:59:02 -0500 (Sat, 25 Oct 2008) | 8 lines

Move AMI initialization to occur after loading modules.  This prevents a
deadlock when someone tries to initiate a module reload from the AMI just
as Asterisk is starting.

(closes issue #13778)
Reported by: hotsblanc
Fix suggested by hotsblanc

........

................

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

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/asterisk.c?view=diff&rev=151907&r1=151906&r2=151907
==============================================================================
--- branches/1.6.1/main/asterisk.c (original)
+++ branches/1.6.1/main/asterisk.c Sat Oct 25 06:11:25 2008
@@ -3323,11 +3323,6 @@
 
 	ast_channels_init();
 
-	if (init_manager()) {
-		printf("%s", term_quit());
-		exit(1);
-	}
-
 	if (ast_cdr_engine_init()) {
 		printf("%s", term_quit());
 		exit(1);
@@ -3375,6 +3370,15 @@
 	}
 
 	if (load_modules(0)) {
+		printf("%s", term_quit());
+		exit(1);
+	}
+
+	/* AMI is initialized after loading modules because of a potential
+	 * conflict between issuing a module reload from manager and
+	 * registering manager actions.  This will cause reversed locking
+	 * order between the module list and manager actions list. */
+	if (init_manager()) {
 		printf("%s", term_quit());
 		exit(1);
 	}