From 3ecd938de2ea83faae32b37989152bccd7fbe6a8 Mon Sep 17 00:00:00 2001
From: jesopo
Date: Sun, 2 Sep 2018 19:52:18 +0100
Subject: IRCLogging -> Logging

---
 IRCBot.py     |  4 ++--
 IRCLogging.py | 47 -----------------------------------------------
 Logging.py    | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 49 deletions(-)
 delete mode 100644 IRCLogging.py
 create mode 100644 Logging.py

diff --git a/IRCBot.py b/IRCBot.py
index 5a5ed286..75751e91 100644
--- a/IRCBot.py
+++ b/IRCBot.py
@@ -1,6 +1,6 @@
 import os, select, sys, threading, time, traceback, uuid
 
-import EventManager, IRCLineHandler, IRCLogging, IRCServer
+import EventManager, IRCLineHandler, IRCServer, Logging
 import ModuleManager, Timer
 
 class Bot(object):
@@ -15,7 +15,7 @@ class Bot(object):
         self.poll = select.epoll()
         self._events = EventManager.EventHook(self)
         self.modules = ModuleManager.ModuleManager(self, self._events)
-        self.log = IRCLogging.Log(self)
+        self.log = Logging.Log(self)
         self.line_handler = IRCLineHandler.LineHandler(self, self._events)
         self.timers = []
         self._events.on("timer").on("reconnect").hook(self.reconnect)
diff --git a/IRCLogging.py b/IRCLogging.py
deleted file mode 100644
index c2fbde1c..00000000
--- a/IRCLogging.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import logging, logging.handlers, sys, time
-
-class BitBotFormatter(logging.Formatter):
-    def formatTime(self, record, datefmt=None):
-        ct = self.converter(record.created)
-        if datefmt:
-            if "%f" in datefmt:
-                msec = "%03d" % record.msecs
-                datefmt = datefmt.replace("%f", msec)
-            s = time.strftime(datefmt, ct)
-        else:
-            t = time.strftime("%Y-%m-%d %H:%M:%S", ct)
-            s = "%s.%03d" % (t, record.msecs)
-        return s
-
-class Log(object):
-    def __init__(self, bot):
-        self.logger = logging.getLogger(__name__)
-        self.logger.setLevel(logging.DEBUG)
-
-        formatter = BitBotFormatter(
-            "%(asctime)s - %(levelname)s - %(message)s",
-            "%Y-%m-%dT%H:%M:%S.%f%z")
-
-        stdout_handler = logging.StreamHandler(sys.stdout)
-        stdout_handler.setLevel(logging.INFO)
-        stdout_handler.setFormatter(formatter)
-        self.logger.addHandler(stdout_handler)
-
-        file_handler = logging.handlers.TimedRotatingFileHandler(
-            "bot.log", when="midnight", backupCount=5)
-        file_handler.setLevel(logging.DEBUG)
-        file_handler.setFormatter(formatter)
-        self.logger.addHandler(file_handler)
-
-    def debug(self, message, params, **kwargs):
-        self._log(message, params, logging.DEBUG, kwargs)
-    def info(self, message, params, **kwargs):
-        self._log(message, params, logging.INFO, kwargs)
-    def warn(self, message, params, **kwargs):
-        self._log(message, params, logging.WARN, kwargs)
-    def error(self, message, params, **kwargs):
-        self._log(message, params, logging.ERROR, kwargs)
-    def critical(self, message, params, **kwargs):
-        self._log(message, params, logging.CRITICAL, kwargs)
-    def _log(self, message, params, level, kwargs):
-        self.logger.log(level, message, *params, **kwargs)
diff --git a/Logging.py b/Logging.py
new file mode 100644
index 00000000..c2fbde1c
--- /dev/null
+++ b/Logging.py
@@ -0,0 +1,47 @@
+import logging, logging.handlers, sys, time
+
+class BitBotFormatter(logging.Formatter):
+    def formatTime(self, record, datefmt=None):
+        ct = self.converter(record.created)
+        if datefmt:
+            if "%f" in datefmt:
+                msec = "%03d" % record.msecs
+                datefmt = datefmt.replace("%f", msec)
+            s = time.strftime(datefmt, ct)
+        else:
+            t = time.strftime("%Y-%m-%d %H:%M:%S", ct)
+            s = "%s.%03d" % (t, record.msecs)
+        return s
+
+class Log(object):
+    def __init__(self, bot):
+        self.logger = logging.getLogger(__name__)
+        self.logger.setLevel(logging.DEBUG)
+
+        formatter = BitBotFormatter(
+            "%(asctime)s - %(levelname)s - %(message)s",
+            "%Y-%m-%dT%H:%M:%S.%f%z")
+
+        stdout_handler = logging.StreamHandler(sys.stdout)
+        stdout_handler.setLevel(logging.INFO)
+        stdout_handler.setFormatter(formatter)
+        self.logger.addHandler(stdout_handler)
+
+        file_handler = logging.handlers.TimedRotatingFileHandler(
+            "bot.log", when="midnight", backupCount=5)
+        file_handler.setLevel(logging.DEBUG)
+        file_handler.setFormatter(formatter)
+        self.logger.addHandler(file_handler)
+
+    def debug(self, message, params, **kwargs):
+        self._log(message, params, logging.DEBUG, kwargs)
+    def info(self, message, params, **kwargs):
+        self._log(message, params, logging.INFO, kwargs)
+    def warn(self, message, params, **kwargs):
+        self._log(message, params, logging.WARN, kwargs)
+    def error(self, message, params, **kwargs):
+        self._log(message, params, logging.ERROR, kwargs)
+    def critical(self, message, params, **kwargs):
+        self._log(message, params, logging.CRITICAL, kwargs)
+    def _log(self, message, params, level, kwargs):
+        self.logger.log(level, message, *params, **kwargs)
-- 
cgit v1.3.1-10-gc9f91