Commit 4f7bc47f authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Removed 'GetJobRPCServer' class. 



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

transfer_service/get_job_rpc_server.py

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
#!/usr/bin/env python



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





class GetJobRPCServer(RedisRPCServer):



    def __init__(self, host, port, db, rpcQueue):

        self.type = "poll"

        config = Config("/etc/vos_ts/vos_ts.conf")

        params = config.loadSection("file_catalog")

        self.dbConn = DbConnector(params["user"],

                                  params["password"],

                                  params["host"],

                                  params.getint("port"),

                                  params["db"],

                                  1,

                                  2)

        params = config.loadSection("logging")

        self.logger = logging.getLogger(__name__)

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

        logFormat = params["log_format"]

        logFormatter = logging.Formatter(logFormat)

        self.logger.setLevel(eval(logLevel))

        redisLogHandler = RedisLogHandler()

        logStreamHandler = logging.StreamHandler()

        logStreamHandler.setFormatter(logFormatter)

        redisLogHandler.setFormatter(logFormatter)

        self.logger.addHandler(redisLogHandler)

        self.logger.addHandler(logStreamHandler)

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



    def callback(self, requestBody):

        if "jobId" in requestBody:

            dbResponse = self.dbConn.getJob(requestBody["jobId"])

            print(f"Db response: {dbResponse}")

            return dbResponse

        else:

            #TODO

            return 42



    def run(self):

        self.logger.info(f"Starting RPC server of type {self.type}...")

        super(GetJobRPCServer, self).run()

transfer_service/transfer_service.py

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ class TransferService(object): 


        # PullToVOSpace (via REST API)

        self.vosRestHandler.addRPCServer("start", "start_job_queue")

        self.vosRestHandler.addRPCServer("poll", "poll_job_queue")

        self.vosRestHandler.addRPCServer("abort", "abort_job_queue")



        # PushToVOSpace (via vos_data, the 'unofficial' command line client)

transfer_service/vospace_rest_handler.py

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ class VOSpaceRestHandler(object): 
    def addRPCServer(self, srvType, rpcQueue):

        if srvType == 'start':

            self.rpcServerList.append(StartJobRPCServer(self.host, self.port, self.db, rpcQueue))

        elif srvType == 'poll':

            self.rpcServerList.append(GetJobRPCServer(self.host, self.port, self.db, rpcQueue))

        elif srvType == 'abort':

            self.rpcServerList.append(AbortJobRPCServer(self.host, self.port, self.db, rpcQueue))

        else: