Do not stop dbQueue in logTerm. dbQueue is not just for logging.
This commit is contained in:
parent
0b6e414998
commit
8f27db5d6f
|
@ -570,7 +570,6 @@ void logInit(const char *name, const Logger::Options &options) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void logTerm() {
|
void logTerm() {
|
||||||
dbQueue.stop();
|
|
||||||
if (Logger::smInstance) {
|
if (Logger::smInstance) {
|
||||||
delete Logger::smInstance;
|
delete Logger::smInstance;
|
||||||
Logger::smInstance = nullptr;
|
Logger::smInstance = nullptr;
|
||||||
|
|
|
@ -382,6 +382,7 @@ int main(int argc, char *argv[]) {
|
||||||
Image::Deinitialise();
|
Image::Deinitialise();
|
||||||
Debug(1, "terminating");
|
Debug(1, "terminating");
|
||||||
logTerm();
|
logTerm();
|
||||||
|
dbQueue.stop();
|
||||||
zmDbClose();
|
zmDbClose();
|
||||||
|
|
||||||
return zm_terminate ? 0 : result;
|
return zm_terminate ? 0 : result;
|
||||||
|
|
|
@ -342,6 +342,7 @@ int main(int argc, const char *argv[], char **envp) {
|
||||||
Debug(1, "Terminating");
|
Debug(1, "Terminating");
|
||||||
Image::Deinitialise();
|
Image::Deinitialise();
|
||||||
logTerm();
|
logTerm();
|
||||||
|
dbQueue.stop();
|
||||||
zmDbClose();
|
zmDbClose();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue