diff --git a/main/asterisk.c b/main/asterisk.c index cee50d6770..0a978a949e 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3061,11 +3061,6 @@ int main(int argc, char *argv[]) ast_channels_init(); - if (init_manager()) { - printf(term_quit()); - exit(1); - } - if (ast_cdr_engine_init()) { printf(term_quit()); exit(1); @@ -3115,6 +3110,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(term_quit()); + exit(1); + } + dnsmgr_start_refresh(); /* We might have the option of showing a console, but for now just