From b4a598e8959037dd0875a13daaac8d14a5b32102 Mon Sep 17 00:00:00 2001 From: tomoaki Date: Tue, 13 Oct 2020 11:19:12 +0900 Subject: [PATCH] Update 9c214a and 438a9a1 Signed-off-by: tomoaki --- MQTTSNGateway/src/MQTTSNGWProcess.cpp | 3 +-- MQTTSNGateway/src/MQTTSNGWVersion.h | 2 +- MQTTSNGateway/src/mainGateway.cpp | 9 +++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/MQTTSNGateway/src/MQTTSNGWProcess.cpp b/MQTTSNGateway/src/MQTTSNGWProcess.cpp index 2e4adfa..90accea 100644 --- a/MQTTSNGateway/src/MQTTSNGWProcess.cpp +++ b/MQTTSNGateway/src/MQTTSNGWProcess.cpp @@ -162,8 +162,7 @@ int Process::getParam(const char* parameter, char* value) if ((fp = fopen(configPath.c_str(), "r")) == NULL) { - WRITELOG("No config file:[%s]\n", configPath.c_str()); - return -1; + throw Exception("No config file:[" + configPath + "]\n"); } while (true) diff --git a/MQTTSNGateway/src/MQTTSNGWVersion.h b/MQTTSNGateway/src/MQTTSNGWVersion.h index 9d68241..251e5af 100644 --- a/MQTTSNGateway/src/MQTTSNGWVersion.h +++ b/MQTTSNGateway/src/MQTTSNGWVersion.h @@ -17,6 +17,6 @@ #ifndef MQTTSNGWVERSION_H_IN_ #define MQTTSNGWVERSION_H_IN_ -#define PAHO_GATEWAY_VERSION "1.3.2" +#define PAHO_GATEWAY_VERSION "1.4.0" #endif /* MQTTSNGWVERSION_H_IN_ */ diff --git a/MQTTSNGateway/src/mainGateway.cpp b/MQTTSNGateway/src/mainGateway.cpp index 6fcbbc4..e05effc 100644 --- a/MQTTSNGateway/src/mainGateway.cpp +++ b/MQTTSNGateway/src/mainGateway.cpp @@ -36,5 +36,14 @@ int main(int argc, char** argv) { gateway.initialize(argc, argv); gateway.run(); + try + { + gateway.initialize(argc, argv); + gateway.run(); + } + catch (const std::exception &ex) { + WRITELOG("\nEclipse Paho MQTT-SN Gateway exception: %s\n", ex.what()); + WRITELOG("MQTT-SNGateway [-f Config file name]\n"); + } return 0; }