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

Use a VOSpace job ID in place of a timestamp in 'storage' and 'import' report files. 



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

transfer_service/import_executor.py

+1 −2
Original line number Diff line number Diff line
@@ -185,8 +185,7 @@ class ImportExecutor(TaskExecutor): 
                    vospacePath = node[2]

                    if node[-1] == "DONE":

                        self.dbConn.setJobId(vospacePath, None)

                timestamp = datetime.datetime.now().strftime("%Y_%m_%d-%H_%M_%S")

                nodeListFile = os.path.join(self.resDir, "vos_import_report-" + timestamp)

                nodeListFile = os.path.join(self.resDir, "vos_import_report-" + self.jobId)

                try:

                    nlfp = open(nodeListFile, "w")

                except IOError:

transfer_service/store_executor.py

+2 −3
Original line number Diff line number Diff line
@@ -146,8 +146,7 @@ class StoreExecutor(TaskExecutor): 
                    self.dbConn.setAsyncTrans(nodeVOSPath, True)

                    self.dbConn.setJobId(nodeVOSPath, None)



                timestamp = dt.now().strftime("%Y_%m_%d-%H_%M_%S")

                nodeListFile = os.path.join(self.resDir, "vos_data_report-" + timestamp)

                nodeListFile = os.path.join(self.resDir, "vos_data_report-" + self.jobId)

                try:

                    nlfp = open(nodeListFile, "w")

                except IOError: