summaryrefslogtreecommitdiff
path: root/main/features.c
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2018-03-10 04:33:33 -0500
committerCorey Farrell <git@cfware.com>2018-03-13 13:46:08 -0400
commitfee929c8acd788a77982b537953bf4053242057e (patch)
tree423c7c705fc7f981ad50c08982da312ab30413ed /main/features.c
parenta979e52c0a351b6784530be04c0b096a7428a720 (diff)
core: Remove non-critical cleanup from startup aborts.
When built-in components of Asterisk fail to start they cause the Asterisk startup to abort. In these cases only the most critical cleanup should be performed - closing databases and terminating proceses. These cleanups are registered using ast_register_atexit, all other cleanups should not be run during startup abort. The main reason for this change is that these cleanup procedures are untestable from the partially initialized states, if they fail it could prevent us from ever running the critical cleanup with ast_run_atexits. Create separate initialization for dns_core.c to be run unconditionally during startup instead of being initialized by the first dns resolver to be registered. This ensures that 'sched' is initialized before it can be potentially used. Replace ast_register_atexit with ast_register_cleanup in media_cache.c. There is no reason for this cleanup to happen unconditionally. Change-Id: Iecc2df98008b21509925ff16740bd5fa29527db3
Diffstat (limited to 'main/features.c')
-rw-r--r--main/features.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/main/features.c b/main/features.c
index 516c64a4a..35039e0fa 100644
--- a/main/features.c
+++ b/main/features.c
@@ -1164,17 +1164,10 @@ int ast_features_init(void)
int res;
res = ast_features_config_init();
- if (res) {
- return res;
- }
res |= ast_register_application2(app_bridge, bridge_exec, NULL, NULL, NULL);
res |= ast_manager_register_xml_core("Bridge", EVENT_FLAG_CALL, action_bridge);
- if (res) {
- features_shutdown();
- } else {
- ast_register_cleanup(features_shutdown);
- }
+ ast_register_cleanup(features_shutdown);
return res;
}