diff options
author | Russell Bryant <russell@russellbryant.com> | 2008-10-25 11:02:11 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2008-10-25 11:02:11 +0000 |
commit | 316f3897a83fe6797388b7e067c4042f5dd8a3f6 (patch) | |
tree | f65b5bfcb7bdfa412858db3f93f7a7947ad9df10 /main | |
parent | c74e85a23a86dde77062cbcd51b050723ef98f9f (diff) |
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: https://origsvn.digium.com/svn/asterisk/trunk@151906 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r-- | main/asterisk.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 782d69772..7da70c232 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3342,11 +3342,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); @@ -3398,6 +3393,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 |