From 453ec5f9403b3bb62f36330056267506306b779e Mon Sep 17 00:00:00 2001
From: Gottfried Gaisbauer <gogo@servus.at>
Date: Mon, 19 Mar 2018 18:37:12 +0100
Subject: [PATCH] reorganised some import, better logging handling now
---
aura.py | 6 +--
guru.py | 4 +-
libraries/base/common.py | 62 ----------------------
libraries/base/config.py | 23 ++++++++
modules/communication/connection_tester.py | 6 +--
modules/communication/redis/adapter.py | 5 +-
6 files changed, 33 insertions(+), 73 deletions(-)
delete mode 100644 libraries/base/common.py
create mode 100644 libraries/base/config.py
diff --git a/aura.py b/aura.py
index 6c46ac91..b4f11040 100755
--- a/aura.py
+++ b/aura.py
@@ -7,10 +7,10 @@ from modules.scheduling.scheduler import AuraScheduler
from modules.communication.liquidsoap.communicator import LiquidSoapCommunicator
from modules.communication.redis.adapter import ServerRedisAdapter
from modules.web.routes import Routes
-from libraries.base.common import AuraCommon
+from libraries.base.config import AuraConfig
+from libraries.base.logger import AuraLogger
-
-class Aura(AuraCommon):
+class Aura(AuraConfig, AuraLogger):
server = None
messenger = None
controller = None
diff --git a/guru.py b/guru.py
index f29deae4..a110318e 100755
--- a/guru.py
+++ b/guru.py
@@ -9,10 +9,10 @@ from argparse import ArgumentParser
# own libs
from modules.cli_tool.padavan import Padavan
from libraries.exceptions.auraexceptions import PlaylistException
-from libraries.base.common import AuraCommon
+from libraries.base.config import AuraConfig
-class Guru(AuraCommon):
+class Guru(AuraConfig):
parser = None
args = None
diff --git a/libraries/base/common.py b/libraries/base/common.py
deleted file mode 100644
index 56e136ac..00000000
--- a/libraries/base/common.py
+++ /dev/null
@@ -1,62 +0,0 @@
-"""
-Common aura functions
-"""
-
-import logging
-
-from modules.base.config import ConfigReader
-
-
-class AuraCommon:
- """
- AuraCommon handles logger, reads and stores config
- """
- logger = None
- config = None
-
- def __init__(self, logger=True):
- self.read_config()
-
- # create logger just once
- if logger:
- self.create_logger("AuraEngine")
-
- def read_config(self):
- """
- reads aura.ini
- :return:
- """
- self.config = ConfigReader()
- self.config.load_config()
-
- def create_logger(self, name):
- """
- Creates the logger instance for AuraEngine
- :param name: LoggerName
- :return:
- """
- lvl = self.config.get("loglevel")
-
- # create logger
- self.logger = logging.getLogger(name)
- self.logger.setLevel(lvl)
-
- # create file handler for logger
- file_handler = logging.FileHandler(self.config.get("logdir") + "/engine.log")
- file_handler.setLevel(lvl)
-
- # create stream handler for logger
- stream_handler = logging.StreamHandler()
- stream_handler.setLevel(lvl)
-
- # set format of log
- datepart = "%(asctime)s:%(name)s:%(levelname)s"
- message = " - %(message)s - "
- filepart = "[%(filename)s:%(lineno)s-%(funcName)s()]"
- formatter = logging.Formatter(datepart + message + filepart)
- file_handler.setFormatter(formatter)
- stream_handler.setFormatter(formatter)
-
- # add handlers to the logger
- self.logger.addHandler(file_handler)
- self.logger.addHandler(stream_handler)
diff --git a/libraries/base/config.py b/libraries/base/config.py
new file mode 100644
index 00000000..c4ff1361
--- /dev/null
+++ b/libraries/base/config.py
@@ -0,0 +1,23 @@
+"""
+Common aura functions
+"""
+
+from modules.base.config import ConfigReader
+
+
+class AuraConfig:
+ """
+ AuraCommon handles logger, reads and stores config
+ """
+ config = None
+
+ def __init__(self):
+ self.read_config()
+
+ def read_config(self):
+ """
+ reads aura.ini
+ :return:
+ """
+ self.config = ConfigReader()
+ self.config.load_config()
diff --git a/modules/communication/connection_tester.py b/modules/communication/connection_tester.py
index 18baa8d6..55af230d 100644
--- a/modules/communication/connection_tester.py
+++ b/modules/communication/connection_tester.py
@@ -3,14 +3,14 @@ import simplejson
from modules.communication.liquidsoap.communicator import LiquidSoapCommunicator
from libraries.database.broadcasts import ScheduleEntry
-from libraries.base.common import AuraCommon
+from libraries.base.config import AuraConfig
from libraries.exceptions.auraexceptions import LQConnectionError
-class ConnectionTester(AuraCommon):
+class ConnectionTester(AuraConfig):
def __init__(self):
- super(ConnectionTester, self).__init__(logger=False)
+ super(ConnectionTester, self).__init__()
def get_connection_status(self):
status = dict()
diff --git a/modules/communication/redis/adapter.py b/modules/communication/redis/adapter.py
index 06b175a2..3fa05d12 100644
--- a/modules/communication/redis/adapter.py
+++ b/modules/communication/redis/adapter.py
@@ -20,11 +20,10 @@ class ServerRedisAdapter(threading.Thread, RedisMessenger):
config = None
redisdb = None
channel = ""
-# auracontroller = None
- redisclient = None
scheduler = None
- liquidsoapcommunicator = None
+ redisclient = None
connection_tester = None
+ liquidsoapcommunicator = None
def __init__(self):
threading.Thread.__init__(self)
--
GitLab