use atexit to make shutdown of replication workers automatic

Signed-off-by: Mic Bowman <[email protected]>

Author: cmickeyb

client/pdo/client/scripts/ShellCLI.py

@@ -37,14 +37,12 @@ def LocalMain(config) :
 
         logger.info("Processing script file %s", str(script_file))
         exit_code = ContractController.ProcessScript(shell, script_file)
-        ContractResponse.exit_commit_workers()
         sys.exit(exit_code)
 
     shell = ContractController.CreateController(config, echo=True, interactive=True)
     shell.cmdloop()
     print("")
 
-    ContractResponse.exit_commit_workers()
     sys.exit(shell.exit_code)
 
 ## XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

python/pdo/contract/response.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import atexit
+
 from pdo.contract.invocation import invocation_response
 import pdo.common.crypto as crypto
 from pdo.common.utility import deprecated
@@ -42,12 +44,13 @@ class ContractResponse(object) :
 
     # -------------------------------------------------------
     @staticmethod
-    def exit_commit_workers():
+    def __exit_commit_workers__():
         """Set the global variable stop_commit_service to True. This will be picked by the workers"""
 
         if ContractResponse.__start_commit_service__ is False: #if True no service has yet been started
             stop_replication_service()
             stop_transacion_processing_service()
+            ContractResponse.__start_commit_service__ = True
 
     # -------------------------------------------------------
     def __init__(self, request, response) :
@@ -101,6 +104,8 @@ def commit_asynchronously(self, ledger_config=None, wait_parameter_for_ledger=30
 
         #start threads for commiting response if not done before
         if ContractResponse.__start_commit_service__:
+            atexit.register(ContractResponse.__exit_commit_workers__)
+
             # start replication service
             start_replication_service()
             start_transaction_processing_service()

python/pdo/test/contract.py

@@ -70,9 +70,6 @@ def ErrorShutdown() :
     except Exception as e :
         logger.exception('shutdown failed')
 
-    # Send termination signal to commit tasks
-    ContractResponse.exit_commit_workers()
-
     sys.exit(-1)
 
 # -----------------------------------------------------------------
@@ -464,9 +461,6 @@ def UpdateTheContract(config, enclaves, contract, contract_invoker_keys) :
     logger.info('completed in %s', time.time() - start_time)
     logger.info('passed %d of %d tests', total_tests - total_failed, total_tests)
 
-    #shutdown commit workers
-    ContractResponse.exit_commit_workers()
-
 # -----------------------------------------------------------------
 # -----------------------------------------------------------------
 def LocalMain(config) :

python/pdo/test/request.py

@@ -69,9 +69,6 @@ def ErrorShutdown() :
     except Exception as e :
         logger.exception('shutdown failed')
 
-    # Send termination signal to commit tasks
-    ContractResponse.exit_commit_workers()
-
     sys.exit(-1)
 
 # -----------------------------------------------------------------
@@ -384,9 +381,6 @@ def UpdateTheContract(config, contract, enclaves, contract_invoker_keys) :
     logger.info("All commits completed")
     logger.info('completed in %s', time.time() - start_time)
 
-    # shutdown commit workers
-    ContractResponse.exit_commit_workers()
-
 # -----------------------------------------------------------------
 # -----------------------------------------------------------------
 def LocalMain(config) :