main/asterisk: Fix startup sequence for realtime features
authorMatthew Jordan <mjordan@digium.com>
Sat, 19 Apr 2014 02:14:12 +0000 (02:14 +0000)
committerMatthew Jordan <mjordan@digium.com>
Sat, 19 Apr 2014 02:14:12 +0000 (02:14 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@412699 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/asterisk.c

index a600db0..8a619b1 100644 (file)
@@ -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);
@@ -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);