From 0decff9b76020618e27f8151813b9ebc20cc2210 Mon Sep 17 00:00:00 2001 From: Tlams Date: Fri, 9 Feb 2018 12:18:52 +0000 Subject: [PATCH] update logs vars --- code/scripts/main/startup.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/code/scripts/main/startup.py b/code/scripts/main/startup.py index 08ba6e4..c0c7dae 100644 --- a/code/scripts/main/startup.py +++ b/code/scripts/main/startup.py @@ -9,6 +9,7 @@ from pathlib import Path from api.v1.api import * +from core.libs.logs import * from core.modules.mod_access import * import configparser import getpass @@ -19,6 +20,7 @@ global passhash urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) if __name__ == "__main__": + """ Read conf """ localconf = configparser.ConfigParser() localconf.read('private/conf/config') @@ -77,7 +79,7 @@ if __name__ == "__main__": '/api/v1/instance/([0-9]+)/database(?:/([0-9]+))', 'database', #  MAPPING NODES - '/api/v1/node(?:/([0-9]+))', 'node', + '/api/v1/nodes(?:/([0-9]+))', 'node', # MAPPING SERVICES '/api/v1/service/([a-z]+)/instance/([0-9]+)/vhost(?:/([0-9]+))', 'service', @@ -123,13 +125,13 @@ if __name__ == "__main__": '/api/v1/static/dates/', 'QueryCache_Dates', # mongoid - '/api/v1/static/(instances|nodes|clusters|storages|disks)/id/[a-z0-9]+', 'General_Search', + '/api/v1/static/(instances|nodes|clusters|storages|disks)/id/([a-z0-9]+)', 'General_Search', ) generalconf = { "logger": {"debug": localconf['logger']['debug'], "debug_level": localconf['logger']['debug_level'], - "logs_file": localconf['logger']['logs_file']}, + "logs_dir": localconf['logger']['logs_dir']}, "analyst": {"walker": localconf['walker']['walker'], "walker_lock": localconf['walker']['walker_lock']}, "keys": {"key_pvt": key_pvt["data"], "key_pub": key_pub["data"]}, "mongodb": {"ip": localconf['databases']['mongodb_ip'], 'port': localconf['databases']['mongodb_port']}, @@ -137,6 +139,10 @@ if __name__ == "__main__": "deploy": {'concurrencydeploy': localconf['deploy']['concurrencydeploy'], 'delayrounddeploy': localconf['deploy']['delayrounddeploy']} } + """ Active logger""" + logger = Logger(generalconf) + + """ First redis connection """ # Lredis = Redis_wrapper(generalconf["redis"]["ip"], generalconf["redis"]["port"]) # Lredis.connect()