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

Minor changes. 



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

transfer_service/store_executor.py

+4 −2
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ class StoreExecutor(TaskExecutor): 
            except Exception:

                self.logger.exception("FATAL: unable to update the file catalog.")

                return False

            else:

                self.logger.info("Job phase updated to EXECUTING.")

            srcPathPrefix = self.storageStorePath.replace("{username}", self.username)

            srcData = os.listdir(srcPathPrefix)

            self.logger.debug("Checking storage available space...")
@@ -180,8 +182,6 @@ class StoreExecutor(TaskExecutor): 
        """

                    msg += info

                    m.setMessage("VOSpace data storage notification", msg)

                # Send e-mail notification

                m.send()

            else:                

                self.jobObj.setPhase("ERROR")

                self.jobObj.setErrorType("fatal")
@@ -210,6 +210,8 @@ class StoreExecutor(TaskExecutor): 
        """

                msg += info

                m.setMessage("VOSpace data storage notification: Job ERROR", msg)

            # Send e-mail notification

            m.send()

        except Exception:

            self.logger.exception(f"FATAL: unable to update the database, job ID: {self.jobId}")

        finally:

transfer_service/store_preprocessor.py

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ class StorePreprocessor(TaskExecutor): 
                self.fileGrouper.recursive(self.path + '/' + dir)



            # Second scan after file grouper execution

            self.logger.info("First-level scan of the 'store' directory")

            self.logger.info(f"First-level scan of '{self.path}'")

            [ dirs, files ] = self.systemUtils.scan(self.path)

            timestamp = dt.now().strftime("%Y_%m_%d-%H_%M_%S")
@@ -127,7 +127,7 @@ class StorePreprocessor(TaskExecutor): 
                return False



            # Third scan after directory structure 'check & repair'

            self.logger.info("Recursive scan of the 'store' directory")

            self.logger.info(f"Recursive scan of '{self.path}'")

            [ dirs, files ] = self.systemUtils.scanRecursive(self.path)

            

            try: