sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Astobj2: Fix initialization order of refdebug and AO2_DEBUG."

This commit is contained in:
Matt Jordan 2015-05-02 10:17:31 -05:00 committed by Gerrit Code Review
parent 7ac28be04b 8f3cee1258
commit 32eb00b70a
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/asterisk.c
View File

@ -4260,7 +4260,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)

9
main/astobj2.c
View File

@ -1143,10 +1143,6 @@ int astobj2_init(void)
{
char ref_filename[1024];
if (container_init() != 0) {
return -1;
}
if (ast_opt_ref_debug) {
snprintf(ref_filename, sizeof(ref_filename), "%s/refs", ast_config_AST_LOG_DIR);
ref_log = fopen(ref_filename, "w");
@ -1155,6 +1151,11 @@ int astobj2_init(void)
}
}
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) */