diff --git a/transfer_service/tape_client.py b/transfer_service/tape_client.py index b02f8abbadac6c4b3afe59ada1035ca7c88eb1d7..7d78060a69f4e39c5adde66859bf4a60f3e77a77 100644 --- a/transfer_service/tape_client.py +++ b/transfer_service/tape_client.py @@ -94,9 +94,9 @@ class TapeClient(object): out = open("tape_client_log.txt", "a") out.write("MIGRATE\n") out.write(f"exitCode: {exitCode}\n") - out.write(f"stdout: {stdout}\n") - out.write(f"stderr: {stderr}\n\n") out.close() + + return exitCode def recall(self, fileList): """ @@ -118,16 +118,16 @@ class TapeClient(object): out = open("tape_client_log.txt", "a") out.write("RECALL\n") out.write(f"exitCode: {exitCode}\n") - out.write(f"stdout: {stdout}\n") - out.write(f"stderr: {stderr}\n\n") out.close() + + return exitCode def recallChecksumFiles(self, dirName): """ Recursively recalls from tape all the checksum files related to the 'dirName' directory. """ - cmd = f"find $(dirname {dirName}) -type f \( -iname \"*-md5sum.txt\" \) | {self.EEADM}" + cmd = f"find $(dirname {dirName}) -type f \( -iname \"*-md5sum.txt\" \) | {self.EEADM} recall" stdin, stdout, stderr = self.client.exec_command(cmd) exitCode = stdout.channel.recv_exit_status() @@ -135,14 +135,9 @@ class TapeClient(object): out = open("tape_client_log.txt", "a") out.write("RECALL_CHECKSUM\n") out.write(f"exitCode: {exitCode}\n") - out.write(f"stdout: {stdout}\n") - out.write(f"stderr: {stderr}\n\n") out.close() - if exitCode: - return False - else: - return True + return exitCode def disconnect(self): """Closes the connection."""