From 63b546e2542cd68318630f3da7138a1737973bec Mon Sep 17 00:00:00 2001 From: tomoaki Date: Sat, 8 May 2021 20:53:02 +0900 Subject: [PATCH] Flush message immediately Signed-off-by: tomoaki --- MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp | 2 +- MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp | 2 +- MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp | 2 +- MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp | 2 +- MQTTSNGateway/src/MQTTSNGWPacketHandleTask.cpp | 2 +- MQTTSNGateway/src/MQTTSNGateway.cpp | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp b/MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp index 4138db4..467cd8a 100644 --- a/MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp +++ b/MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp @@ -64,7 +64,7 @@ void BrokerRecvTask::run(void) _light->blueLight(false); if (CHK_SIGINT) { - WRITELOG("\n%s %s stopped.", currentDateTime(), getTaskName()); + WRITELOG("%s %s stopped.\n", currentDateTime(), getTaskName()); return; } timeout.tv_sec = 0; diff --git a/MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp b/MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp index 4f27645..42d5fd0 100644 --- a/MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp +++ b/MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp @@ -70,7 +70,7 @@ void BrokerSendTask::run() if (ev->getEventType() == EtStop) { - WRITELOG("\n%s %s stopped.", currentDateTime(), getTaskName()); + WRITELOG("%s %s stopped.\n", currentDateTime(), getTaskName()); delete ev; return; } diff --git a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp index 46100fa..779def3 100644 --- a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp +++ b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp @@ -76,7 +76,7 @@ void ClientRecvTask::run() if (CHK_SIGINT) { - WRITELOG("\n%s %s stopped.", currentDateTime(), getTaskName()); + WRITELOG("%s %s stopped.\n", currentDateTime(), getTaskName()); delete packet; return; } diff --git a/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp b/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp index 2d2fa97..4211d5e 100644 --- a/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp +++ b/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp @@ -51,7 +51,7 @@ void ClientSendTask::run() if (ev->getEventType() == EtStop || _gateway->IsStopping()) { - WRITELOG("\n%s %s stopped.", currentDateTime(), getTaskName()); + WRITELOG("%s %s stopped.\n", currentDateTime(), getTaskName()); delete ev; break; } diff --git a/MQTTSNGateway/src/MQTTSNGWPacketHandleTask.cpp b/MQTTSNGateway/src/MQTTSNGWPacketHandleTask.cpp index 6540a87..b9726d9 100644 --- a/MQTTSNGateway/src/MQTTSNGWPacketHandleTask.cpp +++ b/MQTTSNGateway/src/MQTTSNGWPacketHandleTask.cpp @@ -114,7 +114,7 @@ void PacketHandleTask::run() if (ev->getEventType() == EtStop) { - WRITELOG("\n%s %s stopped.", currentDateTime(), getTaskName()); + WRITELOG("%s %s stopped.\n", currentDateTime(), getTaskName()); delete ev; return; } diff --git a/MQTTSNGateway/src/MQTTSNGateway.cpp b/MQTTSNGateway/src/MQTTSNGateway.cpp index 81ad403..2e7b386 100644 --- a/MQTTSNGateway/src/MQTTSNGateway.cpp +++ b/MQTTSNGateway/src/MQTTSNGateway.cpp @@ -317,7 +317,7 @@ void Gateway::run(void) /* Run Tasks until CTRL+C entered or Exception occurred */ MultiTaskProcess::run(); - + WRITELOG("\n"); _stopFlg = true; /* stop Tasks */ @@ -334,7 +334,7 @@ void Gateway::run(void) /* wait until all Task stop */ MultiTaskProcess::waitStop(); - WRITELOG("\n\n%s MQTT-SN Gateway stopped.\n\n", currentDateTime()); + WRITELOG("\n%s MQTT-SN Gateway stopped.\n\n", currentDateTime()); _lightIndicator.allLightOff(); }