mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-13 00:04:53 +00:00
Merge "astobj2: Fix shutdown order."
This commit is contained in:
@@ -1193,8 +1193,11 @@ int astobj2_init(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ast_register_cleanup(astobj2_cleanup);
|
||||||
|
|
||||||
if (container_init() != 0) {
|
if (container_init() != 0) {
|
||||||
fclose(ref_log);
|
fclose(ref_log);
|
||||||
|
ref_log = NULL;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1202,7 +1205,5 @@ int astobj2_init(void)
|
|||||||
ast_cli_register_multiple(cli_astobj2, ARRAY_LEN(cli_astobj2));
|
ast_cli_register_multiple(cli_astobj2, ARRAY_LEN(cli_astobj2));
|
||||||
#endif /* defined(AO2_DEBUG) */
|
#endif /* defined(AO2_DEBUG) */
|
||||||
|
|
||||||
ast_register_cleanup(astobj2_cleanup);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user