From ab43d34a1e4a6e69aaab64a639d7be5d65ccf61e Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Thu, 18 Apr 2019 11:48:38 +0200
Subject: [PATCH] refactor(mpd): Add module name to log messages

---
 include/modules/mpd.hpp |  2 ++
 src/modules/mpd.cpp     | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/modules/mpd.hpp b/include/modules/mpd.hpp
index 3f2d64f..b3134f4 100644
--- a/include/modules/mpd.hpp
+++ b/include/modules/mpd.hpp
@@ -36,6 +36,8 @@ class MPD : public ALabel {
   bool stopped();
   bool playing();
 
+  const std::string module_name_;
+
   using unique_connection = std::unique_ptr<mpd_connection, decltype(&mpd_connection_free)>;
   using unique_status = std::unique_ptr<mpd_status, decltype(&mpd_status_free)>;
   using unique_song = std::unique_ptr<mpd_song, decltype(&mpd_song_free)>;
diff --git a/src/modules/mpd.cpp b/src/modules/mpd.cpp
index 0313e12..7e4e88b 100644
--- a/src/modules/mpd.cpp
+++ b/src/modules/mpd.cpp
@@ -5,6 +5,7 @@
 
 waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config)
     : ALabel(config, "{album} - {artist} - {title}", 5),
+      module_name_(id.empty() ? "mpd" : "mpd#" + id),
       server_(nullptr),
       port_(config["port"].asUInt()),
       connection_(nullptr, &mpd_connection_free),
@@ -166,12 +167,12 @@ std::string waybar::modules::MPD::getStateIcon() {
   }
 
   if (connection_ == nullptr) {
-    std::cerr << "MPD: Trying to fetch state icon while disconnected" << std::endl;
+    std::cerr << module_name_ << ": Trying to fetch state icon while disconnected" << std::endl;
     return "";
   }
 
   if (stopped()) {
-    std::cerr << "MPD: Trying to fetch state icon while stopped" << std::endl;
+    std::cerr << module_name_ << ": Trying to fetch state icon while stopped" << std::endl;
     return "";
   }
 
@@ -188,7 +189,7 @@ std::string waybar::modules::MPD::getOptionIcon(std::string optionName, bool act
   }
 
   if (connection_ == nullptr) {
-    std::cerr << "MPD: Trying to fetch option icon while disconnected" << std::endl;
+    std::cerr << module_name_ << ": Trying to fetch option icon while disconnected" << std::endl;
     return "";
   }
 
@@ -210,7 +211,7 @@ void waybar::modules::MPD::tryConnect() {
       unique_connection(mpd_connection_new(server_, port_, 5'000), &mpd_connection_free);
 
   if (connection_ == nullptr || alternate_connection_ == nullptr) {
-    std::cerr << "Failed to connect to MPD" << std::endl;
+    std::cerr << module_name_ << ": Failed to connect to MPD" << std::endl;
     connection_.reset();
     alternate_connection_.reset();
     return;
@@ -219,7 +220,7 @@ void waybar::modules::MPD::tryConnect() {
   try {
     checkErrors(connection_.get());
   } catch (std::runtime_error e) {
-    std::cerr << "Failed to connect to MPD: " << e.what() << std::endl;
+    std::cerr << module_name_ << ": Failed to connect to MPD: " << e.what() << std::endl;
     connection_.reset();
     alternate_connection_.reset();
   }
@@ -230,7 +231,7 @@ void waybar::modules::MPD::checkErrors(mpd_connection* conn) {
     case MPD_ERROR_SUCCESS:
       return;
     case MPD_ERROR_CLOSED:
-      std::cerr << "Connection to MPD closed" << std::endl;
+      std::cerr << module_name_ << ": Connection to MPD closed" << std::endl;
       mpd_connection_clear_error(conn);
       connection_.reset();
       alternate_connection_.reset();