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

Cleanup. 



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

transfer_service/db_connector.py

+1 −6
Original line number Diff line number Diff line
@@ -1014,9 +1014,6 @@ class DbConnector(object): 
                (node.parentPath,))

            result = cursor.fetchall()

            parentLtreePath = result[0]["path"]

            parentLtreeRelativePath = ""

            if "." in parentLtreePath:

                parentLtreeRelativePath = ".".join(parentLtreePath.strip(".").split('.')[1:])

        except Exception:

            if not conn.closed:

                conn.rollback()
@@ -1025,7 +1022,6 @@ class DbConnector(object): 
            try:

                cursor.execute("""

                    INSERT INTO node(parent_path,

                                     parent_relative_path,

                                     fs_path,

                                     name,

                                     tstamp_wrapper_dir,
@@ -1037,13 +1033,12 @@ class DbConnector(object): 
                                     creator_id,

                                     content_length,

                                     content_md5)

                    VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)

                    VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)

                    ON CONFLICT

                    DO NOTHING

                    RETURNING node_id;

                    """,

                    (parentLtreePath,

                     parentLtreeRelativePath,

                     node.fsPath,

                     node.name,

                     node.wrapperDir,

transfer_service/transfer_service.py

+1 −2
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ class TransferService(object): 
        self.logger.info("""

##########################################################

########## VOSpace Transfer Service is RUNNING! ##########

##########################################################

        """)

##########################################################""")

        #else:

        #    print("The VOSpace Transfer Service requires super user privileges.")

        #    sys.exit(1)