Commit fef57b55 authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Added centralized logging mechanism. 



Signed-off-by: default avatarCristiano Urban <cristiano.urban@inaf.it>
parent 71a2b695

transfer_service/abort_job_rpc_server.py

+7 −7
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


import logging



from redis_log_handler import RedisLogHandler

from redis_rpc_server import RedisRPCServer

from db_connector import DbConnector

from config import Config
@@ -25,17 +26,16 @@ class AbortJobRPCServer(RedisRPCServer): 
        params = config.loadSection("scheduling")

        self.maxPendingJobs = params.getint("max_pending_jobs")

        params = config.loadSection("logging")

        self.logger = logging.getLogger("AbortJobRPCServer")

        self.logger = logging.getLogger(__name__)

        logLevel = "logging." + params["log_level"]

        logDir = params["log_dir"]

        logFile = logDir + '/' + "abort_job_rpc_server.log"

        logFormat = params["log_format"]

        logFormatter = logging.Formatter(logFormat)

        self.logger.setLevel(eval(logLevel))

        logFileHandler = logging.FileHandler(logFile)

        redisLogHandler = RedisLogHandler()

        logStreamHandler = logging.StreamHandler()

        logFormatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")

        logFileHandler.setFormatter(logFormatter)

        logStreamHandler.setFormatter(logFormatter)

        self.logger.addHandler(logFileHandler)

        redisLogHandler.setFormatter(logFormatter)

        self.logger.addHandler(redisLogHandler)

        self.logger.addHandler(logStreamHandler)

        super(AbortJobRPCServer, self).__init__(host, port, db, rpcQueue)

transfer_service/config/vos_ts.conf

+6 −0
Original line number Diff line number Diff line
@@ -87,8 +87,14 @@ admin_email = cristiano.urban@inaf.it 
; log level, allowed values are: DEBUG, INFO, WARNING, ERROR, CRITICAL

; Default level is INFO

log_level = DEBUG

; format of log records

log_format = %(asctime)s - %(name)s - %(levelname)s - %(message)s

; log queue name

log_queue = vos_ts_logs

; physical path on disk where log files are stored

log_dir = /var/log/vos_ts

; log file name

log_file = vos_ts.log

; dir to store results of storage and import operations

res_dir = ${log_dir}/results

transfer_service/data_rpc_server.py

+7 −7
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import logging 
import os

import sys



from redis_log_handler import RedisLogHandler

from redis_rpc_server import RedisRPCServer

from config import Config

from db_connector import DbConnector
@@ -37,17 +38,16 @@ class DataRPCServer(RedisRPCServer): 
        params = config.loadSection("scheduling")

        self.maxPendingJobs = params.getint("max_pending_jobs")

        params = config.loadSection("logging")

        self.logger = logging.getLogger("DataRPCServer")

        self.logger = logging.getLogger(__name__)

        logLevel = "logging." + params["log_level"]

        logDir = params["log_dir"]

        logFile = logDir + '/' + "data_rpc_server.log"

        logFormat = params["log_format"]

        logFormatter = logging.Formatter(logFormat)

        self.logger.setLevel(eval(logLevel))

        logFileHandler = logging.FileHandler(logFile)

        redisLogHandler = RedisLogHandler()

        logStreamHandler = logging.StreamHandler()

        logFormatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")

        logFileHandler.setFormatter(logFormatter)

        logStreamHandler.setFormatter(logFormatter)

        self.logger.addHandler(logFileHandler)

        redisLogHandler.setFormatter(logFormatter)

        self.logger.addHandler(redisLogHandler)

        self.logger.addHandler(logStreamHandler)

        self.pendingQueueWrite = JobQueue("write_pending")

        self.systemUtils = SystemUtils()

transfer_service/get_job_rpc_server.py

+7 −7
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
import json

import logging



from redis_log_handler import RedisLogHandler

from redis_rpc_server import RedisRPCServer

from config import Config

from db_connector import DbConnector
@@ -22,17 +23,16 @@ class GetJobRPCServer(RedisRPCServer): 
                                  1,

                                  2)

        params = config.loadSection("logging")

        self.logger = logging.getLogger("GetJobRPCServer")

        self.logger = logging.getLogger(__name__)

        logLevel = "logging." + params["log_level"]

        logDir = params["log_dir"]

        logFile = logDir + '/' + "get_job_rpc_server.log"

        logFormat = params["log_format"]

        logFormatter = logging.Formatter(logFormat)

        self.logger.setLevel(eval(logLevel))

        logFileHandler = logging.FileHandler(logFile)

        redisLogHandler = RedisLogHandler()

        logStreamHandler = logging.StreamHandler()

        logFormatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")

        logFileHandler.setFormatter(logFormatter)

        logStreamHandler.setFormatter(logFormatter)

        self.logger.addHandler(logFileHandler)

        redisLogHandler.setFormatter(logFormatter)

        self.logger.addHandler(redisLogHandler)

        self.logger.addHandler(logStreamHandler)

        super(GetJobRPCServer, self).__init__(host, port, db, rpcQueue)

transfer_service/group_rw_executor.py

+7 −7
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ from datetime import datetime as dt 
from db_connector import DbConnector

from mailer import Mailer

from node import Node

from redis_log_handler import RedisLogHandler

from system_utils import SystemUtils

from tabulate import tabulate

from task_executor import TaskExecutor
@@ -29,17 +30,16 @@ class GroupRwExecutor(TaskExecutor): 
        params = config.loadSection("mail")

        self.adminEmail = params["admin_email"]

        params = config.loadSection("logging")

        self.logger = logging.getLogger("GroupRwExecutor")

        self.logger = logging.getLogger(__name__)

        logLevel = "logging." + params["log_level"]

        logDir = params["log_dir"]

        logFile = logDir + '/' + "group_rw_executor.log"

        logFormat = params["log_format"]

        logFormatter = logging.Formatter(logFormat)

        self.logger.setLevel(eval(logLevel))

        logFileHandler = logging.FileHandler(logFile)

        redisLogHandler = RedisLogHandler()

        logStreamHandler = logging.StreamHandler()

        logFormatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")

        logFileHandler.setFormatter(logFormatter)

        logStreamHandler.setFormatter(logFormatter)

        self.logger.addHandler(logFileHandler)

        redisLogHandler.setFormatter(logFormatter)

        self.logger.addHandler(redisLogHandler)

        self.logger.addHandler(logStreamHandler)

        self.resDir = params["res_dir"]

        self.systemUtils = SystemUtils()