Skip to content
This repository has been archived by the owner on Jan 14, 2020. It is now read-only.

Commit

Permalink
main/asterisk: Fix startup sequence for realtime features
Browse files Browse the repository at this point in the history
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
........

Merged revisions 412698 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@412699 f38db490-d61c-443f-a65b-d21fe96a405b
  • Loading branch information
matt-jordan committed Apr 19, 2014
1 parent dcc0e45 commit a867b3e
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions main/asterisk.c
Original file line number Diff line number Diff line change
Expand Up @@ -4430,11 +4430,6 @@ int main(int argc, char *argv[])
exit(1);
}

if (ast_features_init()) {
printf("%s", term_quit());
exit(1);
}

if (ast_pickup_init()) {
printf("%s", term_quit());
exit(1);
Expand Down Expand Up @@ -4465,6 +4460,11 @@ int main(int argc, char *argv[])
exit(moduleresult == -2 ? 2 : 1);
}

if (ast_features_init()) {
printf("%s", term_quit());
exit(1);
}

if (dnsmgr_init()) { /* Initialize the DNS manager */
printf("%s", term_quit());
exit(1);
Expand Down

0 comments on commit a867b3e

Please sign in to comment.