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

Minor fixes + cleanup. 



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

transfer_service/abort_job_rpc_server.py

+0 −3
Original line number Diff line number Diff line
@@ -32,11 +32,8 @@ class AbortJobRPCServer(RedisRPCServer): 
        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(AbortJobRPCServer, self).__init__(host, port, db, rpcQueue)



    def callback(self, requestBody):

transfer_service/checksum.py

+2 −3
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ class Checksum(object): 
                    md5sum = row.split("  ./")[0]

                    fileName = row.split("  ./")[1].rstrip()

                    if fileName == os.path.basename(absFilePath):

                        md5File.close()

                        return md5sum

            finally:

                md5File.close()

        return None
@@ -80,5 +80,4 @@ class Checksum(object): 
                        for file in files:

                            filePath = os.path.abspath(folder) + '/' + file

                            md5file.write(self.md5sum(filePath) + "  ./" + file + '\n')

                    finally:

                        md5file.close()

transfer_service/data_rpc_server.py

+0 −3
Original line number Diff line number Diff line
@@ -39,11 +39,8 @@ class DataRPCServer(RedisRPCServer): 
        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)

        self.pendingQueueWrite = JobQueue("write_pending")

        self.systemUtils = SystemUtils()

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

transfer_service/group_rw_executor.py

+0 −3
Original line number Diff line number Diff line
@@ -36,11 +36,8 @@ class GroupRwExecutor(TaskExecutor): 
        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)

        self.resDir = params["res_dir"]

        self.systemUtils = SystemUtils()

        self.jobObj = None

transfer_service/group_rw_rpc_server.py

+0 −3
Original line number Diff line number Diff line
@@ -32,11 +32,8 @@ class GroupRwRPCServer(RedisRPCServer): 
        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)

        self.groupRwReadyQueue = JobQueue("group_rw_ready")

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