More changes

Script/CastorScript.py

@@ -233,9 +233,8 @@ def main(conf):
 
     ##### Wait for the threads to finish and then stop #####
     manager.join()
-    logger.info('Manager Thread joined the main thread')
     copy.join()
-    logger.info('Copy Thread joined the main thread')
+    logger.info('Manager and Copy Threads joined the main thread')
     if delete:
         delete.join()
         logger.info('Delete Thread joined the main thread')
@@ -245,7 +244,6 @@ def main(conf):
     if conf.IS_enabled:
         info_service_thread.join()
         logger.info('InfoService Thread joined the main thread')
-
     if conf.DdmMonitoringEnabled:
         ddm_publisher.join()
         logger.info('DdmMonitoring Thread joined the main thread')

Script/cs/Threads/InfoServiceThread.py

@@ -90,7 +90,7 @@ class InfoServiceThread(threading.Thread):
             is_data.checkin()
             #self.logger.debug("Update sent: %s", str(is_data))
         except Exception as ex:
-            self.logger.error("Error occured in send_update(). Error was: %s", str(ex))
+            self.logger.error("Error occured in send_update(): %s", str(ex))
 
 
     # ##### TESTING FUNCTIONS #####
@@ -98,7 +98,7 @@ class InfoServiceThread(threading.Thread):
     # ## potentially their functionality can be used for migrations between "CastorScriptState" OKS schema definitions
     # ## When we change it, we need to make sure that the old version is not on the server, before we can publish the new version
     # ## otherwise an error occurs.
-    
+
     # def send_wrong_info_update(self, name_of_unwanted_IS_entry, type_of_unwanted_IS_entry):
     #     try:
     #         is_data_type = type_of_unwanted_IS_entry