From b6cc84e474d9ae5b3bfbeeab7f16704dc958e220 Mon Sep 17 00:00:00 2001
From: Artem30801 <artem30801@gmail.com>
Date: Sun, 12 May 2019 14:25:55 +0300
Subject: [PATCH] Another logging approach...

---
 Drone/copter_client.py |  2 +-
 logging_lib.py         | 44 ++++++++++++++++++++++++++++++++++++++++++
 messaging_lib.py       |  5 ++++-
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 logging_lib.py

diff --git a/Drone/copter_client.py b/Drone/copter_client.py
index 1a43657..bca5747 100644
--- a/Drone/copter_client.py
+++ b/Drone/copter_client.py
@@ -35,7 +35,7 @@ class CopterClient(client.Client):
 
     def start(self):
         logger.info("Init ROS node")
-        rospy.init_node('Swarm_client', anonymous=True)
+        rospy.init_node('Swarm_client', anonymous=True, log_level=rospy.DEBUG)
         if self.USE_LEDS:
             LedLib.init_led()
 
diff --git a/logging_lib.py b/logging_lib.py
new file mode 100644
index 0000000..d53100a
--- /dev/null
+++ b/logging_lib.py
@@ -0,0 +1,44 @@
+import logging
+
+try:
+    import rospy
+except ImportError:
+    ros = False
+else:
+    ros = True
+
+
+class Logger:
+    def __init__(self, logger=logging.getLogger(), use_ros=False):
+        self.ros = True if use_ros and ros else False
+        self.logger = logger
+
+    def info(self, msg):
+        self.logger.info(msg)
+
+        if self.ros:
+            rospy.loginfo(msg)
+
+    def debug(self, msg):
+        self.logger.debug(msg)
+
+        if self.ros:
+            rospy.logdebug(msg)
+
+    def warning(self, msg):
+        self.logger.warning(msg)
+
+        if self.ros:
+            rospy.logwarn(msg)
+
+    def error(self, msg):
+        self.logger.error(msg)
+
+        if self.ros:
+            rospy.logerr(msg)
+
+    def critical(self, msg):
+        self.logger.critical(msg)
+
+        if self.ros:
+            rospy.logfatal(msg)
diff --git a/messaging_lib.py b/messaging_lib.py
index b7e2ba3..e23f422 100644
--- a/messaging_lib.py
+++ b/messaging_lib.py
@@ -12,10 +12,13 @@ try:
 except ImportError:
     import selectors2 as selectors
 
+import logging_lib
+
 PendingRequest = collections.namedtuple("PendingRequest", ["value", "requested_value",  # "expires_on",
                                                            "callback", "callback_args", "callback_kwargs",
                                                            ])
-logger = logging.getLogger(__name__)
+_logger = logging.getLogger(__name__)
+logger = logging_lib.Logger(_logger, True)
 
 
 class MessageManager: