kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

main/asterisk: Fix startup sequence for realtime features

Browse Source 
When ASTERISK-23265/ASTERISK-23320 was fixed, it inadvertently led to realtime
features breaking. This was due to features loading prior to realtime. This
patch fixes this by loading features after loading dynamic modules.

ASTERISK-23487 #close
Reported by: Denis
Tested by: Denis


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@412698 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2014-04-19 02:13:15 +00:00
parent 003fa0d955
commit ad1d62c3e8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/asterisk.c
View File

@@ -4431,11 +4431,6 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
if (ast_features_init()) {
printf("%s", term_quit());
exit(1);
}
if (ast_pickup_init()) { if (ast_pickup_init()) {
printf("%s", term_quit()); printf("%s", term_quit());
exit(1); exit(1);
@@ -4466,6 +4461,11 @@ int main(int argc, char *argv[])
exit(moduleresult == -2 ? 2 : 1); exit(moduleresult == -2 ? 2 : 1);
} }
if (ast_features_init()) {
printf("%s", term_quit());
exit(1);
}
if (dnsmgr_init()) { /* Initialize the DNS manager */ if (dnsmgr_init()) { /* Initialize the DNS manager */
printf("%s", term_quit()); printf("%s", term_quit());
exit(1); exit(1);