From 01a172a938e86f6459cb888a2ee40d1a295610cc Mon Sep 17 00:00:00 2001 From: Cristiano Urban Date: Thu, 10 Jun 2021 09:21:11 +0200 Subject: [PATCH] Added basic logging functionalities. Signed-off-by: Cristiano Urban --- transfer_service/import_rpc_server.py | 16 +++++++++++++++- transfer_service/job_rpc_server.py | 16 +++++++++++++++- transfer_service/storage_rpc_server.py | 16 +++++++++++++++- 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/transfer_service/import_rpc_server.py b/transfer_service/import_rpc_server.py index faadbc8..ef7c702 100644 --- a/transfer_service/import_rpc_server.py +++ b/transfer_service/import_rpc_server.py @@ -1,5 +1,6 @@ #!/usr/bin/env python +import logging import os from config import Config @@ -25,6 +26,19 @@ class ImportRPCServer(RedisRPCServer): 2) self.params = config.loadSection("scheduling") self.maxReadyJobs = self.params.getint("max_ready_jobs") + params = config.loadSection("logging") + self.logger = logging.getLogger("ImportRPCServer") + logLevel = "logging." + params["log_level"] + logDir = params["log_dir"] + logFile = logDir + '/' + "import_rpc_server.log" + self.logger.setLevel(eval(logLevel)) + logFileHandler = logging.FileHandler(logFile) + logStreamHandler = logging.StreamHandler() + logFormatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") + logFileHandler.setFormatter(logFormatter) + logStreamHandler.setFormatter(logFormatter) + self.logger.addHandler(logFileHandler) + self.logger.addHandler(logStreamHandler) self.importReadyQueue = JobQueue("import_ready") self.systemUtils = SystemUtils() super(ImportRPCServer, self).__init__(host, port, db, rpcQueue) @@ -104,5 +118,5 @@ class ImportRPCServer(RedisRPCServer): return response def run(self): - print(f"Starting RPC server of type {self.type}...") + self.logger.info(f"Starting RPC server of type {self.type}...") super(ImportRPCServer, self).run() diff --git a/transfer_service/job_rpc_server.py b/transfer_service/job_rpc_server.py index d986060..59c300d 100644 --- a/transfer_service/job_rpc_server.py +++ b/transfer_service/job_rpc_server.py @@ -1,5 +1,6 @@ #!/usr/bin/env python +import logging import os from redis_rpc_server import RedisRPCServer @@ -20,6 +21,19 @@ class JobRPCServer(RedisRPCServer): self.params["db"], 1, 2) + params = config.loadSection("logging") + self.logger = logging.getLogger("JobRPCServer") + logLevel = "logging." + params["log_level"] + logDir = params["log_dir"] + logFile = logDir + '/' + "job_rpc_server.log" + self.logger.setLevel(eval(logLevel)) + logFileHandler = logging.FileHandler(logFile) + logStreamHandler = logging.StreamHandler() + logFormatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") + logFileHandler.setFormatter(logFormatter) + logStreamHandler.setFormatter(logFormatter) + self.logger.addHandler(logFileHandler) + self.logger.addHandler(logStreamHandler) super(JobRPCServer, self).__init__(host, port, db, rpcQueue) def callback(self, requestBody): @@ -60,5 +74,5 @@ class JobRPCServer(RedisRPCServer): return response def run(self): - print(f"Starting RPC server of type {self.type}...") + self.logger.info(f"Starting RPC server of type {self.type}...") super(JobRPCServer, self).run() diff --git a/transfer_service/storage_rpc_server.py b/transfer_service/storage_rpc_server.py index b09c9c8..7345931 100644 --- a/transfer_service/storage_rpc_server.py +++ b/transfer_service/storage_rpc_server.py @@ -1,5 +1,6 @@ #!/usr/bin/env python +import logging import os from redis_rpc_server import RedisRPCServer @@ -20,6 +21,19 @@ class StorageRPCServer(RedisRPCServer): self.params["db"], 1, 2) + params = config.loadSection("logging") + self.logger = logging.getLogger("StorageRPCServer") + logLevel = "logging." + params["log_level"] + logDir = params["log_dir"] + logFile = logDir + '/' + "storage_rpc_server.log" + self.logger.setLevel(eval(logLevel)) + logFileHandler = logging.FileHandler(logFile) + logStreamHandler = logging.StreamHandler() + logFormatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") + logFileHandler.setFormatter(logFormatter) + logStreamHandler.setFormatter(logFormatter) + self.logger.addHandler(logFileHandler) + self.logger.addHandler(logStreamHandler) super(StorageRPCServer, self).__init__(host, port, db, rpcQueue) def callback(self, requestBody): @@ -85,5 +99,5 @@ class StorageRPCServer(RedisRPCServer): return response def run(self): - print(f"Starting RPC server of type {self.type}...") + self.logger.info(f"Starting RPC server of type {self.type}...") super(StorageRPCServer, self).run() -- GitLab