From 927caf94ad0d7b98d4b2c3833da8f0f2707d4f87 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sat, 1 Dec 2018 13:29:28 +0100 Subject: wanda: replace usage of iostream with spdlog --- src/commander.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/commander.cpp') diff --git a/src/commander.cpp b/src/commander.cpp index bf6d0d2..6cb1996 100644 --- a/src/commander.cpp +++ b/src/commander.cpp @@ -1,27 +1,28 @@ #include "commander.hpp" #include "message.hpp" -#include +#include namespace wanda { -commander::commander(asio::io_service &service, std::filesystem::path socket) +commander::commander(asio::io_service &service, std::filesystem::path socket, std::shared_ptr logger) : m_service{service}, m_endpoint{socket.string()}, - m_socket{service} + m_socket{service}, + m_logger{logger} { } void commander::start() { - std::clog << "[commander::start] Starting commander on socket '" << m_endpoint.path() << "'\n"; m_socket.async_connect(m_endpoint, [&](auto const &error) { if (error) { - std::cerr << "[commander::start] error occured: " << error.message() << '\n'; + m_logger->error("error while connecting to control interface: '{}'", error.message()); } else { + m_logger->info("establishing connection to wanda deamon"); m_connection = wanda::make_control_connection(std::move(m_socket)); m_connection->add(this); m_connection->start(); @@ -32,18 +33,19 @@ void commander::start() void commander::on_error(control_connection::pointer connection, std::error_code error) { - std::cerr << "[commander::on_error] error occured: " << error.message() << '\n'; + m_logger->error("control interface communication error: '{}'", error.message()); } void commander::on_received(wanda::control_connection::pointer connection, message message) { if (auto state = connection->current_state(); message.command == "HELLO" && state == control_connection::state::fresh) { + m_logger->info("connection to wanda deamon successfully established"); connection->update(control_connection::state::established); } else { - std::cerr << "[commander::on_receive] unexpected message: " << message << '\n'; + m_logger->error("unexpected message: '{}'", message); } } -- cgit v1.2.3