tom/doorlockd-mirror
1
0
Fork 0
mirror of https://github.com/binary-kitchen/doorlockd synced 2024-12-22 10:24:26 +01:00
Code Issues Releases Wiki Activity

doorlock-client: refactor run to app_run

Browse Source 
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
This commit is contained in:
Ralf Ramsauer 2016-07-21 20:57:31 +02:00
parent 48d0fcaf6f
commit 4ccf8e4f24
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doorlockd/client/doorlock-client.cpp
View File

@ -36,7 +36,7 @@ const static std::string subscriptionCommand =
// The receive buffer length of the TCP socket // The receive buffer length of the TCP socket
constexpr static int SOCKET_BUFFERLENGTH = 2048; constexpr static int SOCKET_BUFFERLENGTH = 2048;
static volatile bool run = true; static volatile bool app_run = true;
static std::unique_ptr<MainWindow> mainWindow = nullptr; static std::unique_ptr<MainWindow> mainWindow = nullptr;
@ -181,9 +181,9 @@ int main(int argc, char** argv)
std::thread clientThread = std::thread([&] () { std::thread clientThread = std::thread([&] () {
// If the TCP client returns, an error has occured // If the TCP client returns, an error has occured
// In normal operation, it never returns // In normal operation, it never returns
while (run) { while (app_run) {
doorlock_client(hostname, port); doorlock_client(hostname, port);
if (run) { if (app_run) {
l(LogLevel::error, "client aborted, retrying in 5 seconds"); l(LogLevel::error, "client aborted, retrying in 5 seconds");
// Todo: Write message to QT frontend // Todo: Write message to QT frontend
@ -198,7 +198,7 @@ int main(int argc, char** argv)
// This routine will never return in normal operation // This routine will never return in normal operation
app.exec(); app.exec();
run = false; app_run = false;
// Stop the IO service // Stop the IO service
io_service.stop(); io_service.stop();