Commit 46e09fb1 authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Minor changes. 



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

transfer_service/abort_job_rpc_server.py

+3 −3
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ class AbortJobRPCServer(RedisRPCServer): 
        logFormatter = logging.Formatter(logFormat)

        self.logger.setLevel(eval(logLevel))

        redisLogHandler = RedisLogHandler()

        logStreamHandler = logging.StreamHandler()

        logStreamHandler.setFormatter(logFormatter)

        #logStreamHandler = logging.StreamHandler()

        #logStreamHandler.setFormatter(logFormatter)

        redisLogHandler.setFormatter(logFormatter)

        self.logger.addHandler(redisLogHandler)

        self.logger.addHandler(logStreamHandler)

        #self.logger.addHandler(logStreamHandler)

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



    def callback(self, requestBody):

transfer_service/data_rpc_server.py

+3 −3
Original line number Diff line number Diff line
@@ -39,11 +39,11 @@ class DataRPCServer(RedisRPCServer): 
        logFormatter = logging.Formatter(logFormat)

        self.logger.setLevel(eval(logLevel))

        redisLogHandler = RedisLogHandler()

        logStreamHandler = logging.StreamHandler()

        logStreamHandler.setFormatter(logFormatter)

        #logStreamHandler = logging.StreamHandler()

        #logStreamHandler.setFormatter(logFormatter)

        redisLogHandler.setFormatter(logFormatter)

        self.logger.addHandler(redisLogHandler)

        self.logger.addHandler(logStreamHandler)

        #self.logger.addHandler(logStreamHandler)

        self.pendingQueueWrite = JobQueue("write_pending")

        self.systemUtils = SystemUtils()

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

transfer_service/file_grouper.py

+12 −8
Original line number Diff line number Diff line
@@ -61,7 +61,11 @@ class FileGrouper(object): 
                cwd = os.getcwd()

                parent = os.path.dirname(folder)

                os.chdir(parent)

                try:

                    sp = subprocess.run(["tar", "-cf", os.path.basename(folder) + ".tar", os.path.basename(folder)], capture_output = True)

                except Exception:

                    raise

                else:

                    if(sp.returncode or sp.stderr):

                        raise(TarFileCreationException(folder))

                    else:

transfer_service/group_rw_executor.py

+3 −3
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ class GroupRwExecutor(TaskExecutor): 
        logFormatter = logging.Formatter(logFormat)

        self.logger.setLevel(eval(logLevel))

        redisLogHandler = RedisLogHandler()

        logStreamHandler = logging.StreamHandler()

        logStreamHandler.setFormatter(logFormatter)

        #logStreamHandler = logging.StreamHandler()

        #logStreamHandler.setFormatter(logFormatter)

        redisLogHandler.setFormatter(logFormatter)

        self.logger.addHandler(redisLogHandler)

        self.logger.addHandler(logStreamHandler)

        #self.logger.addHandler(logStreamHandler)

        self.resDir = params["res_dir"]

        self.systemUtils = SystemUtils()

        self.jobObj = None

transfer_service/group_rw_rpc_server.py

+3 −3
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ class GroupRwRPCServer(RedisRPCServer): 
        logFormatter = logging.Formatter(logFormat)

        self.logger.setLevel(eval(logLevel))

        redisLogHandler = RedisLogHandler()

        logStreamHandler = logging.StreamHandler()

        logStreamHandler.setFormatter(logFormatter)

        #logStreamHandler = logging.StreamHandler()

        #logStreamHandler.setFormatter(logFormatter)

        redisLogHandler.setFormatter(logFormatter)

        self.logger.addHandler(redisLogHandler)

        self.logger.addHandler(logStreamHandler)

        #self.logger.addHandler(logStreamHandler)

        self.groupRwReadyQueue = JobQueue("group_rw_ready")

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