mirror of
https://github.com/asterisk/asterisk.git
synced 2026-07-07 15:19:24 -07:00
don't abort Asterisk load if configuration not found (issue #5115)
don't register channel type until after config has been loaded git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6590 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
+2
-3
@@ -12414,15 +12414,14 @@ int load_module()
|
||||
ast_log(LOG_WARNING, "Unable to create I/O context\n");
|
||||
}
|
||||
|
||||
reload_config(); /* Load the configuration from sip.conf */
|
||||
|
||||
/* Make sure we can register our sip channel type */
|
||||
if (ast_channel_register(&sip_tech)) {
|
||||
ast_log(LOG_ERROR, "Unable to register channel type %s\n", channeltype);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (reload_config()) /* Load the configuration from sip.conf */
|
||||
return -1;
|
||||
|
||||
/* Register all CLI functions for SIP */
|
||||
ast_cli_register_multiple(my_clis, sizeof(my_clis)/ sizeof(my_clis[0]));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user