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

........

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


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@151907 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 9 insertions, 5 deletions

diff --git a/main/asterisk.c b/main/asterisk.c
index dc6cf9cdc..652bacf10 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3323,11 +3323,6 @@ int main(int argc, char *argv[])
 
 	ast_channels_init();
 
-	if (init_manager()) {
-		printf("%s", term_quit());
-		exit(1);
-	}
-
 	if (ast_cdr_engine_init()) {
 		printf("%s", term_quit());
 		exit(1);
@@ -3379,6 +3374,15 @@ int main(int argc, char *argv[])
 		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);
+	}
+
 	dnsmgr_start_refresh();
 
 	/* We might have the option of showing a console, but for now just