diff --git a/src/config.py b/src/config.py --- a/src/config.py +++ b/src/config.py @@ -5,17 +5,17 @@ from logging.handlers import TimedRotati directory = os.path.join(os.path.dirname(__file__), "..") -configFile = os.path.join(directory, "config.json") +config_file = os.path.join(directory, "config.json") conf = dict() -if os.path.isfile(configFile): - with open(configFile) as f: conf = json.load(f) +if os.path.isfile(config_file): + with open(config_file) as f: conf = json.load(f) -logFile = conf.get("logFile", "/var/log/morevna/mor.log") +log_file = conf.get("logFile", "/var/log/morevna/mor.log") logger = log.getLogger() logger.setLevel(log.INFO) formatter = log.Formatter("%(asctime)s %(levelname)s: %(message)s",datefmt="%Y-%m-%d %H:%M:%S") -handler = TimedRotatingFileHandler(logFile, when="midnight", backupCount=9) +handler = TimedRotatingFileHandler(log_file, when="midnight", backupCount=9) handler.setFormatter(formatter) logger.addHandler(handler) @@ -24,12 +24,12 @@ keyfile = os.path.join(directory,"certs/ peers = os.path.join(directory,"certs/peers.pem") version = [0, 1, 1] -lowestCompatible=[0, 1, 0] # tuple is more fitting but json conversion transforms it into a list anyway +lowest_compatible = [0, 1, 0] # tuple is more fitting but json conversion transforms it into a list anyway -hosts=conf.get("hosts", ["127.0.0.1"]) -port=conf.get("port", 9901) +hosts = conf.get("hosts", ["127.0.0.1"]) +port = conf.get("port", 9901) -bSize=conf.get("batchSize", dict()) -class batchSize: - hash=bSize.get("hash", 256) - data=bSize.get("data", 64) +bSize = conf.get("batch_size", dict()) +class batch_size: + hash = bSize.get("hash", 256) + data = bSize.get("data", 64)