Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
8 changes: 4 additions & 4 deletions MiniGatewayMqtt.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "MiniGatewayMqtt.h"

#include <SemanticLog.h>
#include <Log.h>
#include <algorithm>
#include <iot/mqtt/Topic.h>
#include <list>
Expand Down Expand Up @@ -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, "", "");
}
Expand All @@ -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();
Expand All @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <cstdint>
#include <express/legacy/in/WebApp.h>
#include <express/middleware/VerboseRequest.h>
#include <SemanticLog.h>
#include <Log.h>
#include <net/config/ConfigInstance.h>
#include <net/in/stream/legacy/SocketClient.h>
#include <string>
Expand All @@ -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;
}
}
Expand Down