diff --git a/code/scripts/main/core/libs/logs.py b/code/scripts/main/core/libs/logs.py index 4510bcf..2256c5b 100644 --- a/code/scripts/main/core/libs/logs.py +++ b/code/scripts/main/core/libs/logs.py @@ -7,86 +7,7 @@ import re import json from sys import getsizeof -class StreamToLogger(object): - def __init__(self, logger, log_level=logging.INFO): - self.logger = logger - self.log_level = log_level - self.linebuf = '' - - def write(self, buf): - for line in buf.rstrip().splitlines(): - self.logger.log(self.log_level, line.rstrip()) - - -""" -class VAction(argparse.Action): - def __call__(self, parser, args, values, option_string=None): - # print 'values: {v!r}'.format(v=values) - if values is None: - values = '1' - try: - values = int(values) - except ValueError: - values = values.count('v') + 1 - setattr(args, self.dest, values) -""" - - -class Logger(object): - def __init__(self, generalconf): - self.debug = generalconf['logger']['debug'] - self.logs_dir = generalconf['logger']['logs_dir'] - self.debug_level = generalconf['logger']['debug_level'] - self.stdout_logger = None - - def run(self): - # HTTP Debug (verbose !!) - if self.debug is True: - # Logging configuration INFO, DEBUG, ERROR - logging.basicConfig( - level=logging.DEBUG, - format='%(asctime)s:%(levelname)s:%(name)s:%(threadName)s:%(message)s', - filename="{0}/debug.log".format(self.logs_dir), - filemode='a' - ) - - http_client.HTTPConnection.debuglevel = 1 - requests_log = logging.getLogger("requests.packages.urllib3") - requests_log.propagate = True - sl = StreamToLogger(self.stdout_logger, logging.DEBUG) - sys.stdout = sl - - else: - # Logging configuration INFO, DEBUG, ERROR - logging.basicConfig( - level=logging.ERROR, - format='%(asctime)s:%(levelname)s:%(name)s:%(threadName)s:%(message)s', - filename="{0}/errors.log".format(self.logs_dir), - filemode='a' - ) - - loginlv = ["INFO", "WARNING", "ERROR", "CRITICAL", "DEBUG"] - for lv in loginlv: - self.stdout_logger = logging.getLogger(lv) - sl = StreamToLogger(self.stdout_logger, logging.INFO) - sys.stdout = sl - - return self.stdout_logger - - def logsout(self, node, errortxt): - now = datetime.datetime.now() - date = now.strftime("%Y-%m-%d %H:%M") - errortxt = re.sub(r"ticket\?(.*?) ", "ticket?username=***YOUR_USER***&password=***PWD***", errortxt) - - error = "[{date} -- {node}] : {error} \n".format(date=date, node=node, error=errortxt) - errorlog = open("{0}/proxmox.log".format(self.logs_dir), "ab") - errorlog.write(error.encode('utf-8')) - errorlog.close() - - - - -class Logger2: +class Logger: def __init__(self, loggerconf): self.logs_dir = loggerconf['logs_dir'] self.log_level = int(loggerconf['logs_level']) diff --git a/code/scripts/main/core/modules/mod_analyst.py b/code/scripts/main/core/modules/mod_analyst.py index a863c77..822d4c6 100644 --- a/code/scripts/main/core/modules/mod_analyst.py +++ b/code/scripts/main/core/modules/mod_analyst.py @@ -56,7 +56,7 @@ class Analyse: def run(self, instancetype="all"): """ Active logger""" - logger = Logger2(self.generalconf["logger"]) + logger = Logger(self.generalconf["logger"]) logger.write({"result": "INFO", "type": "HYPERPROXMOX", "value": "Start logger - Analyst Module"}) insert_time = time.time() diff --git a/code/scripts/main/startup.py b/code/scripts/main/startup.py index 41fb322..43ffbc5 100644 --- a/code/scripts/main/startup.py +++ b/code/scripts/main/startup.py @@ -41,7 +41,7 @@ if __name__ == "__main__": } """ Active logger""" - logger = Logger2(generalconf["logger"]) + logger = Logger(generalconf["logger"]) logger.write({"result": "INFO", "type": "HYPERPROXMOX", "value": "Start logger"}) logger.write({"result": "INFO", "type": "HYPERPROXMOX", "value": ">>>>>>> -- NEW STARTUP -- <<<<<<<"})