]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
main/asterisk: Fix startup sequence for realtime features
authorMatthew Jordan <mjordan@digium.com>
Sat, 19 Apr 2014 02:13:15 +0000 (02:13 +0000)
committerMatthew Jordan <mjordan@digium.com>
Sat, 19 Apr 2014 02:13:15 +0000 (02:13 +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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@412698 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/asterisk.c

index 8cb8eede3fabcbd31af34c1dc70fb83cf67cb045..e3b39302accd6ef94c6b38359c762646eac30e5c 100644 (file)
@@ -4431,11 +4431,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);
@@ -4466,6 +4461,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);