From 539fba7f73d6b849d76da329aa9ef3447a4d1145 Mon Sep 17 00:00:00 2001
From: Lukas Fritz Marti <lukas.fritz.marti@cern.ch>
Date: Fri, 14 Oct 2011 14:35:17 +0000
Subject: [PATCH] Fixed bug in setup without ERS
---
Script/CastorScript.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Script/CastorScript.py b/Script/CastorScript.py
index bb21a7b..984cec9 100755
--- a/Script/CastorScript.py
+++ b/Script/CastorScript.py
@@ -113,7 +113,8 @@ def main(conf):
% str(ex),extra=logInfo)
##### Start looking for the partition #####
- check = CheckThread(conf, manager, copy, delete, event, logger, ERS_handler)
+ if conf.ERS_enabled:
+ check = CheckThread(conf, manager, copy, delete, event, logger, ERS_handler)
##### Create db logger #####
@@ -191,7 +192,8 @@ def main(conf):
manager.start()
copy.start()
delete.start()
- check.start()
+ if conf.ERS_enabled:
+ check.start()
logInfo = {'file':logger.findCaller()[0],'line':logger.findCaller()[1]}
logger.info('Manager,Copy, Delete and Check Threads started',extra = logInfo)
@@ -255,13 +257,15 @@ def main(conf):
manager.managerExit()
copy.copyExit()
delete.deleteExit()
- check.checkExit()
+ if conf.ERS_enabled:
+ check.checkExit()
##### Wait for the threads to finish and then stop #####
manager.join()
copy.join()
delete.join()
- check.join()
+ if conf.ERS_enabled:
+ check.join()
logInfo = {'file':logger.findCaller()[0],'line':logger.findCaller()[1]}
logger.info('Manager,Copy, Delete and Check Threads joined the main thread',extra = logInfo)
--
GitLab