diff --git a/CMakeLists.txt b/CMakeLists.txt index f56fb79..2c82ebb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) find_package(nlohmann_json 3.7.0 REQUIRED) find_package( - snodec 1.0.0 REQUIRED COMPONENTS http-server-express-legacy-in + snodec 2.0.0 REQUIRED COMPONENTS http-server-express-legacy-in net-in-stream-legacy mqtt-client ) diff --git a/MiniGatewayMqtt.cpp b/MiniGatewayMqtt.cpp index 5c09323..62ab273 100644 --- a/MiniGatewayMqtt.cpp +++ b/MiniGatewayMqtt.cpp @@ -1,6 +1,6 @@ #include "MiniGatewayMqtt.h" -#include +#include #include #include #include @@ -31,7 +31,7 @@ namespace minigateway { } void MiniGatewayMqtt::onConnected() { - snode::semantic::appLog().info() << "MQTT: initiating session"; + snode::log::application().info() << "MQTT: initiating session"; sendConnect(true, "", "", 0, false, "", ""); } @@ -43,7 +43,7 @@ namespace minigateway { } bool MiniGatewayMqtt::onSignal(int signum) { - snode::semantic::appLog().info() << "MQTT: exit due to signal " << signum << " (SIG" + snode::log::application().info() << "MQTT: exit due to signal " << signum << " (SIG" << utils::system::sigabbrev_np(signum) << ")"; sendDisconnect(); @@ -64,7 +64,7 @@ namespace minigateway { } void MiniGatewayMqtt::onPublish(const iot::mqtt::packets::Publish& publish) { - snode::semantic::appLog().debug() << "MQTT command on " << publish.getTopic() << ": " << publish.getMessage(); + snode::log::application().debug() << "MQTT command on " << publish.getTopic() << ": " << publish.getMessage(); } void MiniGatewayMqtt::publishMeasurement(const Measurement& measurement) const { diff --git a/main.cpp b/main.cpp index b6bf678..489790b 100644 --- a/main.cpp +++ b/main.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include @@ -20,16 +20,16 @@ namespace { void reportState(const std::string& instanceName, const core::socket::SocketAddress& socketAddress, const core::socket::State& state) { switch (state) { case core::socket::State::OK: - snode::semantic::appLog().info() << instanceName << ": connected/listening on '" << socketAddress.toString() << "'"; + snode::log::application().info() << instanceName << ": connected/listening on '" << socketAddress.toString() << "'"; break; case core::socket::State::DISABLED: - snode::semantic::appLog().info() << instanceName << ": disabled"; + snode::log::application().info() << instanceName << ": disabled"; break; case core::socket::State::ERROR: - snode::semantic::appLog().error() << instanceName << " " << socketAddress.toString() << ": " << state.what(); + snode::log::application().error() << instanceName << " " << socketAddress.toString() << ": " << state.what(); break; case core::socket::State::FATAL: - snode::semantic::appLog().critical() << instanceName << " " << socketAddress.toString() << ": " << state.what(); + snode::log::application().critical() << instanceName << " " << socketAddress.toString() << ": " << state.what(); break; } }