Mercurial > irccd

changeset 653:026a8dd20bd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Irccd: style (irccd) #782
author David Demelier <markand@malikania.fr>
date Tue, 27 Mar 2018 20:20:00 +0200
parents e37ac2269ba6
children 0fbb37fa3d59
files irccd/main.cpp libirccd-js/irccd/js/logger_jsapi.cpp libirccd-js/irccd/js/server_jsapi.cpp libirccd-js/irccd/js/timer_jsapi.cpp libirccd-test/irccd/test/plugin_test.cpp libirccd/irccd/daemon/command/server_connect_command.cpp libirccd/irccd/daemon/irccd.hpp libirccd/irccd/daemon/service/plugin_service.cpp libirccd/irccd/daemon/service/rule_service.cpp libirccd/irccd/daemon/service/server_service.cpp libirccd/irccd/daemon/service/transport_service.cpp tests/src/libirccd-js/jsapi-logger/main.cpp
diffstat 12 files changed, 99 insertions(+), 97 deletions(-) [+]
line wrap: on
line diff
--- a/irccd/main.cpp	Tue Mar 27 20:17:22 2018 +0200
+++ b/irccd/main.cpp	Tue Mar 27 20:20:00 2018 +0200
@@ -127,7 +127,7 @@
     sys::set_program_name("irccd");
 
     // Default logging to console.
-    instance->log().set_verbose(false);
+    instance->get_log().set_verbose(false);
 
     -- argc;
     ++ argv;
@@ -161,10 +161,10 @@
                 version(result);
                 // NOTREACHED
             if (pair.first == "-v" || pair.first == "--verbose")
-                instance->log().set_verbose(true);
+                instance->get_log().set_verbose(true);
         }
     } catch (const std::exception& ex) {
-        instance->log().warning() << "irccd: " << ex.what() << std::endl;
+        instance->get_log().warning() << "irccd: " << ex.what() << std::endl;
         usage();
     }
 
--- a/libirccd-js/irccd/js/logger_jsapi.cpp	Tue Mar 27 20:17:22 2018 +0200
+++ b/libirccd-js/irccd/js/logger_jsapi.cpp	Tue Mar 27 20:20:00 2018 +0200
@@ -46,7 +46,7 @@
  */
 duk_ret_t info(duk_context* ctx)
 {
-    return print(ctx, dukx_get_irccd(ctx).log().info());
+    return print(ctx, dukx_get_irccd(ctx).get_log().info());
 }
 
 /*
@@ -60,7 +60,7 @@
  */
 duk_ret_t warning(duk_context* ctx)
 {
-    return print(ctx, dukx_get_irccd(ctx).log().warning());
+    return print(ctx, dukx_get_irccd(ctx).get_log().warning());
 }
 
 /*
@@ -74,7 +74,7 @@
  */
 duk_ret_t debug(duk_context* ctx)
 {
-    return print(ctx, dukx_get_irccd(ctx).log().debug());
+    return print(ctx, dukx_get_irccd(ctx).get_log().debug());
 }
 
 const duk_function_list_entry functions[] = {
--- a/libirccd-js/irccd/js/server_jsapi.cpp	Tue Mar 27 20:17:22 2018 +0200
+++ b/libirccd-js/irccd/js/server_jsapi.cpp	Tue Mar 27 20:20:00 2018 +0200
@@ -373,7 +373,7 @@
 
     try {
         auto json = duk_json_encode(ctx, 0);
-        auto s = server_util::from_json(dukx_get_irccd(ctx).service(), nlohmann::json::parse(json));
+        auto s = server_util::from_json(dukx_get_irccd(ctx).get_service(), nlohmann::json::parse(json));
 
         duk_push_this(ctx);
         duk_push_pointer(ctx, new std::shared_ptr<server>(std::move(s)));
--- a/libirccd-js/irccd/js/timer_jsapi.cpp	Tue Mar 27 20:17:22 2018 +0200
+++ b/libirccd-js/irccd/js/timer_jsapi.cpp	Tue Mar 27 20:20:00 2018 +0200
@@ -85,9 +85,9 @@
     duk_remove(ctx, -2);
 
     if (duk_pcall(ctx, 0)) {
-        dukx_get_irccd(ctx).log().warning() << "plugin: " << plugin->get_name()
+        dukx_get_irccd(ctx).get_log().warning() << "plugin: " << plugin->get_name()
             << " timer error:" << std::endl;
-        dukx_get_irccd(ctx).log().warning() << "  "
+        dukx_get_irccd(ctx).get_log().warning() << "  "
             << dukx_stack(ctx, -1).what() << std::endl;
     } else
         duk_pop(ctx);
@@ -189,7 +189,7 @@
     duk_del_prop_string(ctx, -1, ptr->key().c_str());
     duk_pop(ctx);
 
-    dukx_get_irccd(ctx).log().debug("timer: destroyed");
+    dukx_get_irccd(ctx).get_log().debug("timer: destroyed");
 
     delete ptr;
 
@@ -224,7 +224,7 @@
         duk_error(ctx, DUK_ERR_TYPE_ERROR, "missing callback function");
 
     auto& daemon = dukx_get_irccd(ctx);
-    auto object = new timer(daemon.service(), dukx_get_plugin(ctx), delay, static_cast<timer::type_t>(type));
+    auto object = new timer(daemon.get_service(), dukx_get_plugin(ctx), delay, static_cast<timer::type_t>(type));
 
     duk_push_this(ctx);
     duk_push_pointer(ctx, object);
--- a/libirccd-test/irccd/test/plugin_test.cpp	Tue Mar 27 20:17:22 2018 +0200
+++ b/libirccd-test/irccd/test/plugin_test.cpp	Tue Mar 27 20:20:00 2018 +0200
@@ -46,8 +46,8 @@
     server_->set_nickname("irccd");
     plugin_ = std::make_unique<js_plugin>(std::move(name), std::move(path));
 
-    irccd_.log().set_verbose(false);
     irccd_.set_log(std::make_unique<silent_logger>());
+    irccd_.get_log().set_verbose(false);
     irccd_.plugins().add(plugin_);
     irccd_.servers().add(server_);
 
--- a/libirccd/irccd/daemon/command/server_connect_command.cpp	Tue Mar 27 20:17:22 2018 +0200
+++ b/libirccd/irccd/daemon/command/server_connect_command.cpp	Tue Mar 27 20:20:00 2018 +0200
@@ -33,7 +33,7 @@
 
 void server_connect_command::exec(irccd& irccd, transport_client& client, const nlohmann::json& args)
 {
-    auto server = server_util::from_json(irccd.service(), args);
+    auto server = server_util::from_json(irccd.get_service(), args);
 
     if (irccd.servers().has(server->get_name()))
         throw server_error(server_error::already_exists);
--- a/libirccd/irccd/daemon/irccd.hpp	Tue Mar 27 20:17:22 2018 +0200
+++ b/libirccd/irccd/daemon/irccd.hpp	Tue Mar 27 20:20:00 2018 +0200
@@ -48,8 +48,8 @@
  */
 class irccd {
 private:
-    // Configurations.
-    class config config_;
+    // Configuration.
+    config config_;
 
     // Main io service.
     boost::asio::io_service& service_;
@@ -101,7 +101,7 @@
      *
      * \return the configuration
      */
-    inline const class config& config() const noexcept
+    inline const config& get_config() const noexcept
     {
         return config_;
     }
@@ -111,7 +111,7 @@
      *
      * \param cfg the new config
      */
-    inline void set_config(class config cfg) noexcept
+    inline void set_config(config cfg) noexcept
     {
         config_ = std::move(cfg);
     }
@@ -121,7 +121,7 @@
      *
      * \return the service
      */
-    inline const boost::asio::io_service& service() const noexcept
+    inline const boost::asio::io_service& get_service() const noexcept
     {
         return service_;
     }
@@ -131,7 +131,7 @@
      *
      * \return the service
      */
-    inline boost::asio::io_service& service() noexcept
+    inline boost::asio::io_service& get_service() noexcept
     {
         return service_;
     }
@@ -141,7 +141,7 @@
      *
      * \return the logger
      */
-    inline const logger& log() const noexcept
+    inline const logger& get_log() const noexcept
     {
         return *logger_;
     }
@@ -151,7 +151,7 @@
      *
      * \return the logger
      */
-    inline logger& log() noexcept
+    inline logger& get_log() noexcept
     {
         return *logger_;
     }
--- a/libirccd/irccd/daemon/service/plugin_service.cpp	Tue Mar 27 20:17:22 2018 +0200
+++ b/libirccd/irccd/daemon/service/plugin_service.cpp	Tue Mar 27 20:20:00 2018 +0200
@@ -53,7 +53,7 @@
         try {
             plugin->handle_unload(irccd_);
         } catch (const std::exception& ex) {
-            irccd_.log().warning() << "plugin: " << plugin->get_name() << ": " << ex.what() << std::endl;
+            irccd_.get_log().warning() << "plugin: " << plugin->get_name() << ": " << ex.what() << std::endl;
         }
     }
 }
@@ -99,18 +99,18 @@
 
 plugin_config plugin_service::config(const std::string& id)
 {
-    return to_map<plugin_config>(irccd_.config(), string_util::sprintf("plugin.%s", id));
+    return to_map<plugin_config>(irccd_.get_config(), string_util::sprintf("plugin.%s", id));
 }
 
 plugin_formats plugin_service::formats(const std::string& id)
 {
-    return to_map<plugin_formats>(irccd_.config(), string_util::sprintf("format.%s", id));
+    return to_map<plugin_formats>(irccd_.get_config(), string_util::sprintf("format.%s", id));
 }
 
 plugin_paths plugin_service::paths(const std::string& id)
 {
-    auto defaults = to_map<plugin_paths>(irccd_.config(), "paths");
-    auto paths = to_map<plugin_paths>(irccd_.config(), string_util::sprintf("paths.%s", id));
+    auto defaults = to_map<plugin_paths>(irccd_.get_config(), "paths");
+    auto paths = to_map<plugin_paths>(irccd_.get_config(), string_util::sprintf("paths.%s", id));
 
     // Fill defaults paths.
     if (!defaults.count("cache"))
@@ -223,7 +223,7 @@
             try {
                 load(name, option.value());
             } catch (const std::exception& ex) {
-                irccd_.log().warning(ex.what());
+                irccd_.get_log().warning(ex.what());
             }
         }
     }
--- a/libirccd/irccd/daemon/service/rule_service.cpp	Tue Mar 27 20:17:22 2018 +0200
+++ b/libirccd/irccd/daemon/service/rule_service.cpp	Tue Mar 27 20:20:00 2018 +0200
@@ -77,14 +77,16 @@
 {
     bool result = true;
 
-    irccd_.log().debug(string_util::sprintf("rule: solving for server=%s, channel=%s, origin=%s, plugin=%s, event=%s",
-        server, channel, origin, plugin, event));
+    irccd_.get_log().debug(string_util::sprintf(
+        "rule: solving for server=%s, channel=%s, origin=%s, plugin=%s, event=%s",
+        server, channel, origin, plugin, event
+    ));
 
     int i = 0;
     for (const auto& rule : rules_) {
         auto action = rule.get_action() == rule::action::accept ? "accept" : "drop";
 
-        irccd_.log().debug() << "  candidate "   << i++ << ":\n"
+        irccd_.get_log().debug() << "  candidate "   << i++ << ":\n"
             << "    servers: "  << string_util::join(rule.get_servers()) << "\n"
             << "    channels: " << string_util::join(rule.get_channels()) << "\n"
             << "    origins: "  << string_util::join(rule.get_origins()) << "\n"
@@ -110,7 +112,7 @@
         try {
             rules_.push_back(rule_util::from_config(section));
         } catch (const std::exception& ex) {
-            irccd_.log().warning() << "rule: " << ex.what() << std::endl;
+            irccd_.get_log().warning() << "rule: " << ex.what() << std::endl;
         }
     }
 }
--- a/libirccd/irccd/daemon/service/server_service.cpp	Tue Mar 27 20:17:22 2018 +0200
+++ b/libirccd/irccd/daemon/service/server_service.cpp	Tue Mar 27 20:20:00 2018 +0200
@@ -45,16 +45,16 @@
         auto allowed = daemon.rules().solve(server, target, origin, plugin->get_name(), eventname);
 
         if (!allowed) {
-            daemon.log().debug("rule: event skipped on match");
+            daemon.get_log().debug("rule: event skipped on match");
             continue;
         }
 
-        daemon.log().debug("rule: event allowed");
+        daemon.get_log().debug("rule: event allowed");
 
         try {
             exec_func(*plugin);
         } catch (const std::exception& ex) {
-            daemon.log().warning() << "plugin " << plugin->get_name() << ": error: "
+            daemon.get_log().warning() << "plugin " << plugin->get_name() << ": error: "
                 << ex.what() << std::endl;
         }
     }
@@ -64,7 +64,7 @@
 
 void server_service::handle_connect(const connect_event& ev)
 {
-    irccd_.log().debug() << "server " << ev.server->get_name() << ": event onConnect" << std::endl;
+    irccd_.get_log().debug() << "server " << ev.server->get_name() << ": event onConnect" << std::endl;
     irccd_.transports().broadcast(nlohmann::json::object({
         { "event",      "onConnect"             },
         { "server",     ev.server->get_name()   }
@@ -85,7 +85,7 @@
     // First, remove the server in case of exceptions.
     servers_.erase(std::find(servers_.begin(), servers_.end(), ev.server));
 
-    irccd_.log().debug() << "server " << ev.server->get_name() << ": event onDisconnect" << std::endl;
+    irccd_.get_log().debug() << "server " << ev.server->get_name() << ": event onDisconnect" << std::endl;
     irccd_.transports().broadcast(nlohmann::json::object({
         { "event",      "onDisconnect"          },
         { "server",     ev.server->get_name()   }
@@ -103,10 +103,10 @@
 
 void server_service::handle_invite(const invite_event& ev)
 {
-    irccd_.log().debug() << "server " << ev.server->get_name() << ": event onInvite:\n";
-    irccd_.log().debug() << "  origin: " << ev.origin << "\n";
-    irccd_.log().debug() << "  channel: " << ev.channel << "\n";
-    irccd_.log().debug() << "  target: " << ev.nickname << std::endl;
+    irccd_.get_log().debug() << "server " << ev.server->get_name() << ": event onInvite:\n";
+    irccd_.get_log().debug() << "  origin: " << ev.origin << "\n";
+    irccd_.get_log().debug() << "  channel: " << ev.channel << "\n";
+    irccd_.get_log().debug() << "  target: " << ev.nickname << std::endl;
 
     irccd_.transports().broadcast(nlohmann::json::object({
         { "event",      "onInvite"              },
@@ -127,9 +127,9 @@
 
 void server_service::handle_join(const join_event& ev)
 {
-    irccd_.log().debug() << "server " << ev.server->get_name() << ": event onJoin:\n";
-    irccd_.log().debug() << "  origin: " << ev.origin << "\n";
-    irccd_.log().debug() << "  channel: " << ev.channel << std::endl;
+    irccd_.get_log().debug() << "server " << ev.server->get_name() << ": event onJoin:\n";
+    irccd_.get_log().debug() << "  origin: " << ev.origin << "\n";
+    irccd_.get_log().debug() << "  channel: " << ev.channel << std::endl;
 
     irccd_.transports().broadcast(nlohmann::json::object({
         { "event",      "onJoin"                },
@@ -150,11 +150,11 @@
 
 void server_service::handle_kick(const kick_event& ev)
 {
-    irccd_.log().debug() << "server " << ev.server->get_name() << ": event onKick:\n";
-    irccd_.log().debug() << "  origin: " << ev.origin << "\n";
-    irccd_.log().debug() << "  channel: " << ev.channel << "\n";
-    irccd_.log().debug() << "  target: " << ev.target << "\n";
-    irccd_.log().debug() << "  reason: " << ev.reason << std::endl;
+    irccd_.get_log().debug() << "server " << ev.server->get_name() << ": event onKick:\n";
+    irccd_.get_log().debug() << "  origin: " << ev.origin << "\n";
+    irccd_.get_log().debug() << "  channel: " << ev.channel << "\n";
+    irccd_.get_log().debug() << "  target: " << ev.target << "\n";
+    irccd_.get_log().debug() << "  reason: " << ev.reason << std::endl;
 
     irccd_.transports().broadcast(nlohmann::json::object({
         { "event",      "onKick"                },
@@ -177,10 +177,10 @@
 
 void server_service::handle_message(const message_event& ev)
 {
-    irccd_.log().debug() << "server " << ev.server->get_name() << ": event onMessage:\n";
-    irccd_.log().debug() << "  origin: " << ev.origin << "\n";
-    irccd_.log().debug() << "  channel: " << ev.channel << "\n";
-    irccd_.log().debug() << "  message: " << ev.message << std::endl;
+    irccd_.get_log().debug() << "server " << ev.server->get_name() << ": event onMessage:\n";
+    irccd_.get_log().debug() << "  origin: " << ev.origin << "\n";
+    irccd_.get_log().debug() << "  channel: " << ev.channel << "\n";
+    irccd_.get_log().debug() << "  message: " << ev.message << std::endl;
 
     irccd_.transports().broadcast(nlohmann::json::object({
         { "event",      "onMessage"             },
@@ -218,10 +218,10 @@
 
 void server_service::handle_me(const me_event& ev)
 {
-    irccd_.log().debug() << "server " << ev.server->get_name() << ": event onMe:\n";
-    irccd_.log().debug() << "  origin: " << ev.origin << "\n";
-    irccd_.log().debug() << "  target: " << ev.channel << "\n";
-    irccd_.log().debug() << "  message: " << ev.message << std::endl;
+    irccd_.get_log().debug() << "server " << ev.server->get_name() << ": event onMe:\n";
+    irccd_.get_log().debug() << "  origin: " << ev.origin << "\n";
+    irccd_.get_log().debug() << "  target: " << ev.channel << "\n";
+    irccd_.get_log().debug() << "  message: " << ev.message << std::endl;
 
     irccd_.transports().broadcast(nlohmann::json::object({
         { "event",      "onMe"                  },
@@ -243,13 +243,13 @@
 
 void server_service::handle_mode(const mode_event& ev)
 {
-    irccd_.log().debug() << "server " << ev.server->get_name() << ": event onMode\n";
-    irccd_.log().debug() << "  origin: " << ev.origin << "\n";
-    irccd_.log().debug() << "  channel: " << ev.channel << "\n";
-    irccd_.log().debug() << "  mode: " << ev.mode << "\n";
-    irccd_.log().debug() << "  limit: " << ev.limit << "\n";
-    irccd_.log().debug() << "  user: " << ev.user << "\n";
-    irccd_.log().debug() << "  mask: " << ev.mask << std::endl;
+    irccd_.get_log().debug() << "server " << ev.server->get_name() << ": event onMode\n";
+    irccd_.get_log().debug() << "  origin: " << ev.origin << "\n";
+    irccd_.get_log().debug() << "  channel: " << ev.channel << "\n";
+    irccd_.get_log().debug() << "  mode: " << ev.mode << "\n";
+    irccd_.get_log().debug() << "  limit: " << ev.limit << "\n";
+    irccd_.get_log().debug() << "  user: " << ev.user << "\n";
+    irccd_.get_log().debug() << "  mask: " << ev.mask << std::endl;
 
     irccd_.transports().broadcast(nlohmann::json::object({
         { "event",      "onMode"                },
@@ -274,9 +274,9 @@
 
 void server_service::handle_names(const names_event& ev)
 {
-    irccd_.log().debug() << "server " << ev.server->get_name() << ": event onNames:\n";
-    irccd_.log().debug() << "  channel: " << ev.channel << "\n";
-    irccd_.log().debug() << "  names: " << string_util::join(ev.names.begin(), ev.names.end(), ", ") << std::endl;
+    irccd_.get_log().debug() << "server " << ev.server->get_name() << ": event onNames:\n";
+    irccd_.get_log().debug() << "  channel: " << ev.channel << "\n";
+    irccd_.get_log().debug() << "  names: " << string_util::join(ev.names.begin(), ev.names.end(), ", ") << std::endl;
 
     auto names = nlohmann::json::array();
 
@@ -302,9 +302,9 @@
 
 void server_service::handle_nick(const nick_event& ev)
 {
-    irccd_.log().debug() << "server " << ev.server->get_name() << ": event onNick:\n";
-    irccd_.log().debug() << "  origin: " << ev.origin << "\n";
-    irccd_.log().debug() << "  nickname: " << ev.nickname << std::endl;
+    irccd_.get_log().debug() << "server " << ev.server->get_name() << ": event onNick:\n";
+    irccd_.get_log().debug() << "  origin: " << ev.origin << "\n";
+    irccd_.get_log().debug() << "  nickname: " << ev.nickname << std::endl;
 
     irccd_.transports().broadcast(nlohmann::json::object({
         { "event",      "onNick"                },
@@ -325,10 +325,10 @@
 
 void server_service::handle_notice(const notice_event& ev)
 {
-    irccd_.log().debug() << "server " << ev.server->get_name() << ": event onNotice:\n";
-    irccd_.log().debug() << "  origin: " << ev.origin << "\n";
-    irccd_.log().debug() << "  channel: " << ev.channel << "\n";
-    irccd_.log().debug() << "  message: " << ev.message << std::endl;
+    irccd_.get_log().debug() << "server " << ev.server->get_name() << ": event onNotice:\n";
+    irccd_.get_log().debug() << "  origin: " << ev.origin << "\n";
+    irccd_.get_log().debug() << "  channel: " << ev.channel << "\n";
+    irccd_.get_log().debug() << "  message: " << ev.message << std::endl;
 
     irccd_.transports().broadcast(nlohmann::json::object({
         { "event",      "onNotice"              },
@@ -350,10 +350,10 @@
 
 void server_service::handle_part(const part_event& ev)
 {
-    irccd_.log().debug() << "server " << ev.server->get_name() << ": event onPart:\n";
-    irccd_.log().debug() << "  origin: " << ev.origin << "\n";
-    irccd_.log().debug() << "  channel: " << ev.channel << "\n";
-    irccd_.log().debug() << "  reason: " << ev.reason << std::endl;
+    irccd_.get_log().debug() << "server " << ev.server->get_name() << ": event onPart:\n";
+    irccd_.get_log().debug() << "  origin: " << ev.origin << "\n";
+    irccd_.get_log().debug() << "  channel: " << ev.channel << "\n";
+    irccd_.get_log().debug() << "  reason: " << ev.reason << std::endl;
 
     irccd_.transports().broadcast(nlohmann::json::object({
         { "event",      "onPart"                },
@@ -375,10 +375,10 @@
 
 void server_service::handle_topic(const topic_event& ev)
 {
-    irccd_.log().debug() << "server " << ev.server->get_name() << ": event onTopic:\n";
-    irccd_.log().debug() << "  origin: " << ev.origin << "\n";
-    irccd_.log().debug() << "  channel: " << ev.channel << "\n";
-    irccd_.log().debug() << "  topic: " << ev.topic << std::endl;
+    irccd_.get_log().debug() << "server " << ev.server->get_name() << ": event onTopic:\n";
+    irccd_.get_log().debug() << "  origin: " << ev.origin << "\n";
+    irccd_.get_log().debug() << "  channel: " << ev.channel << "\n";
+    irccd_.get_log().debug() << "  topic: " << ev.topic << std::endl;
 
     irccd_.transports().broadcast(nlohmann::json::object({
         { "event",      "onTopic"               },
@@ -400,12 +400,12 @@
 
 void server_service::handle_whois(const whois_event& ev)
 {
-    irccd_.log().debug() << "server " << ev.server->get_name() << ": event onWhois\n";
-    irccd_.log().debug() << "  nickname: " << ev.whois.nick << "\n";
-    irccd_.log().debug() << "  username: " << ev.whois.user << "\n";
-    irccd_.log().debug() << "  host: " << ev.whois.host << "\n";
-    irccd_.log().debug() << "  realname: " << ev.whois.realname << "\n";
-    irccd_.log().debug() << "  channels: " << string_util::join(ev.whois.channels, ", ") << std::endl;
+    irccd_.get_log().debug() << "server " << ev.server->get_name() << ": event onWhois\n";
+    irccd_.get_log().debug() << "  nickname: " << ev.whois.nick << "\n";
+    irccd_.get_log().debug() << "  username: " << ev.whois.user << "\n";
+    irccd_.get_log().debug() << "  host: " << ev.whois.host << "\n";
+    irccd_.get_log().debug() << "  realname: " << ev.whois.realname << "\n";
+    irccd_.get_log().debug() << "  channels: " << string_util::join(ev.whois.channels, ", ") << std::endl;
 
     irccd_.transports().broadcast(nlohmann::json::object({
         { "event",      "onWhois"               },
@@ -518,9 +518,9 @@
             continue;
 
         try {
-            add(server_util::from_config(irccd_.service(), cfg, section));
+            add(server_util::from_config(irccd_.get_service(), cfg, section));
         } catch (const std::exception& ex) {
-            irccd_.log().warning() << "server " << section.get("name").value() << ": "
+            irccd_.get_log().warning() << "server " << section.get("name").value() << ": "
                 << ex.what() << std::endl;
         }
     }
--- a/libirccd/irccd/daemon/service/transport_service.cpp	Tue Mar 27 20:17:22 2018 +0200
+++ b/libirccd/irccd/daemon/service/transport_service.cpp	Tue Mar 27 20:20:00 2018 +0200
@@ -60,8 +60,8 @@
         } catch (const boost::system::system_error& ex) {
             tc->error(ex.code(), (*cmd)->get_name());
         } catch (const std::exception& ex) {
-            irccd_.log().warning() << "transport: unknown error not reported" << std::endl;
-            irccd_.log().warning() << "transport: " << ex.what() << std::endl;
+            irccd_.get_log().warning() << "transport: unknown error not reported" << std::endl;
+            irccd_.get_log().warning() << "transport: " << ex.what() << std::endl;
         }
     }
 }
@@ -71,7 +71,7 @@
     tc->recv([this, tc] (auto code, auto json) {
         switch (code.value()) {
         case boost::system::errc::network_down:
-            irccd_.log().warning("transport: client disconnected");
+            irccd_.get_log().warning("transport: client disconnected");
             break;
         case boost::system::errc::invalid_argument:
             tc->error(irccd_error::invalid_message);
@@ -91,12 +91,12 @@
 {
     ts.accept([this, &ts] (auto code, auto client) {
         if (code)
-            irccd_.log().warning() << "transport: new client error: " << code.message() << std::endl;
+            irccd_.get_log().warning() << "transport: new client error: " << code.message() << std::endl;
         else {
             do_accept(ts);
             do_recv(std::move(client));
 
-            irccd_.log().info() << "transport: new client connected" << std::endl;
+            irccd_.get_log().info() << "transport: new client connected" << std::endl;
         }
     });
 }
@@ -132,9 +132,9 @@
             continue;
 
         try {
-            add(transport_util::from_config(irccd_.service(), section));
+            add(transport_util::from_config(irccd_.get_service(), section));
         } catch (const std::exception& ex) {
-            irccd_.log().warning() << "transport: " << ex.what() << std::endl;
+            irccd_.get_log().warning() << "transport: " << ex.what() << std::endl;
         }
     }
 }
--- a/tests/src/libirccd-js/jsapi-logger/main.cpp	Tue Mar 27 20:17:22 2018 +0200
+++ b/tests/src/libirccd-js/jsapi-logger/main.cpp	Tue Mar 27 20:20:00 2018 +0200
@@ -63,7 +63,7 @@
     logger_test()
     {
         irccd_.set_log(std::make_unique<my_logger>(*this));
-        irccd_.log().set_verbose(true);
+        irccd_.get_log().set_verbose(true);
     }
 };