diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-05-02 10:17:26 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-05-02 10:17:26 -0500 |
| commit | b4000f2d44e7ce2d8208a811cf2eb19925504494 (patch) | |
| tree | 5293de21cda500f2d4b9470de1fd6c38e2d1acca | |
| parent | 1b19c15f17d7275b7f807e0532b9a5d2ea829aa2 (diff) | |
| parent | 5875bf183c255f19ededdb1004f35fd15cd1e6cf (diff) | |
Merge "Astobj2: Fix initialization order of refdebug and AO2_DEBUG." into 13
| -rw-r--r-- | main/asterisk.c | 5 | ||||
| -rw-r--r-- | main/astobj2.c | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 2b70a99b0..137ee9315 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -4353,7 +4353,10 @@ int main(int argc, char *argv[]) register_config_cli(); read_config_maps(); - astobj2_init(); + if (astobj2_init()) { + printf("Failed: astobj2_init\n%s", term_quit()); + exit(1); + } if (ast_opt_console) { if (el_hist == NULL || el == NULL) diff --git a/main/astobj2.c b/main/astobj2.c index f1d500174..1bb5237f1 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -899,13 +899,7 @@ int astobj2_init(void) { #ifdef REF_DEBUG char ref_filename[1024]; -#endif - - if (container_init() != 0) { - return -1; - } -#ifdef REF_DEBUG snprintf(ref_filename, sizeof(ref_filename), "%s/refs", ast_config_AST_LOG_DIR); ref_log = fopen(ref_filename, "w"); if (!ref_log) { @@ -913,6 +907,11 @@ int astobj2_init(void) } #endif + if (container_init() != 0) { + fclose(ref_log); + return -1; + } + #if defined(AO2_DEBUG) ast_cli_register_multiple(cli_astobj2, ARRAY_LEN(cli_astobj2)); #endif /* defined(AO2_DEBUG) */ |