Initialize channels prior to loading "preload" modules.
We can have bad results when a module, upon being loaded, attempts to reference the channels container if the container hasn't yet been initialized. I saw this happen by trying to preload pbx_config.so and having a hint defined which referenced a non-existent SIP peer. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@253872 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
755f086320
commit
4b1ca40f36
|
@ -3603,6 +3603,8 @@ int main(int argc, char *argv[])
|
|||
ast_xmldoc_load_documentation();
|
||||
#endif
|
||||
|
||||
ast_channels_init();
|
||||
|
||||
if ((moduleresult = load_modules(1))) { /* Load modules, pre-load only */
|
||||
printf("%s", term_quit());
|
||||
exit(moduleresult == -2 ? 2 : 1);
|
||||
|
@ -3615,8 +3617,6 @@ int main(int argc, char *argv[])
|
|||
|
||||
ast_http_init(); /* Start the HTTP server, if needed */
|
||||
|
||||
ast_channels_init();
|
||||
|
||||
if (init_manager()) {
|
||||
printf("%s", term_quit());
|
||||
exit(1);
|
||||
|
|
Reference in New Issue