nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid handling tasks during shutdown

Browse Source
This commit is contained in:
john30
2017-04-26 09:36:42 +02:00
parent d5ad81d531
commit 1ca01ceb10
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mainloop.cpp
+6 -2
View File
@@ -223,7 +223,7 @@ void MainLoop::run() {
lastSignal -= lastTaskRun-now; lastSignal -= lastTaskRun-now;
} }
lastTaskRun = now; lastTaskRun = now;
} else if (now > lastTaskRun+taskDelay) { } else if (!m_shutdown && now > lastTaskRun+taskDelay) {
logDebug(lf_main, "performing regular tasks"); logDebug(lf_main, "performing regular tasks");
if (m_busHandler->hasSignal()) { if (m_busHandler->hasSignal()) {
lastSignal = now; lastSignal = now;
@@ -288,7 +288,7 @@ void MainLoop::run() {
} }
} }
} }
if (now > nextCheckRun) { if (!m_shutdown && now > nextCheckRun) {
TCPClient client; TCPClient client;
TCPSocket* socket = client.connect("ebusd.eu", 80); TCPSocket* socket = client.connect("ebusd.eu", 80);
if (socket) { if (socket) {
@@ -396,6 +396,10 @@ void MainLoop::run() {
if (netMessage == NULL) { if (netMessage == NULL) {
continue; continue;
} }
if (m_shutdown) {
netMessage->setResult("ERR: shutdown", "", false, now, true);
break;
}
string request = netMessage->getRequest(); string request = netMessage->getRequest();
string user = netMessage->getUser(); string user = netMessage->getUser();
bool listening = netMessage->isListening(&since); bool listening = netMessage->isListening(&since);