Minor changes. (7a3c7971) · Commits · VOSpace INAF / vospace-transfer-service

transfer_service/checksum.py

+3 −2

Original line number	Diff line number	Diff line
		@@ -37,15 +37,15 @@ class Checksum(object):
		md5FileName = os.path.dirname(absFilePath) + self.md5FileSuffix
		try:
		md5File = open(md5FileName, "r")
		except IOError:
		except (FileNotFoundError, IOError):
		raise
		else:
		for row in md5File:
		md5sum = row.split(" ./")[0]
		fileName = row.split(" ./")[1].rstrip()
		if fileName == os.path.basename(absFilePath):
		md5File.close()
		return md5sum
		finally:
		md5File.close()
		return None

		@@ -76,4 +76,5 @@ class Checksum(object):
		for file in files:
		filePath = os.path.abspath(folder) + '/' + file
		md5file.write(self.md5sum(filePath) + " ./" + file + '\n')
		finally:
		md5file.close()

+13 −22

Original line number	Diff line number	Diff line
		@@ -29,15 +29,7 @@ class LogListener(Process):
		if os.path.exists(self.logFilePath):
		os.remove(self.logFilePath)
		while True:
		time.sleep(2)
		try:
		queueLen = self.redisCli.llen(self.logQueue)
		except ConnectionError:
		pass
		except Exception:
		raise
		else:
		while queueLen > 0:
		time.sleep(1)
		try:
		lfp = open(self.logFilePath, 'a')
		except IOError:
		@@ -46,11 +38,10 @@ class LogListener(Process):
		try:
		logRecord = self.redisCli.brpop(self.logQueue)[1].decode("utf-8")
		except ConnectionError:
		break
		time.sleep(2)
		except Exception:
		raise
		else:
		lfp.write(logRecord + '\n')
		queueLen -= 1
		finally:
		lfp.close()