From 9653c6d35766ff4ffc3278fc0b0850ddb4b426f8 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Sat, 19 Apr 2014 02:14:12 +0000 Subject: [PATCH] main/asterisk: Fix startup sequence for realtime features 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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/main/asterisk.c b/main/asterisk.c index a600db097f..8a619b1eb1 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -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);