From ac1defaf4cf4736c3c285159ff9de618fd590715 Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Wed, 13 Nov 2024 11:04:20 -0500 Subject: [PATCH] squash w/ setup. Clean up controller.py - use --test-mode, remove unused parameter. --- scripts/irods/controller.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/irods/controller.py b/scripts/irods/controller.py index c8505239fe..018cfdd7fc 100644 --- a/scripts/irods/controller.py +++ b/scripts/irods/controller.py @@ -92,7 +92,7 @@ def start(self, write_to_stdout=False, test_mode=False): env_var_name = 'IRODS_ENABLE_TEST_MODE' if test_mode or (env_var_name in os.environ and os.environ[env_var_name] == '1'): - cmd.append('-t') + cmd.append('--test-mode') if write_to_stdout: l.info('Starting iRODS server ...') @@ -111,14 +111,14 @@ def start(self, write_to_stdout=False, test_mode=False): self.wait_for_server_to_start() - def stop(self, timeout=20, graceful=False): + def stop(self, graceful=False): l = logging.getLogger(__name__) self.config.clear_cache() l.debug('Calling stop on IrodsController') server_pid = self.get_server_pid() if server_pid is None: - l.info('iRODS server is not running') + l.info('No iRODS server running') return l.info('Stopping iRODS server...') @@ -137,7 +137,7 @@ def reload_configuration(self): server_pid = self.get_server_pid() if server_pid is None: - l.info('iRODS server is not running') + l.info('No iRODS server running') return old_agent_factory_pid = self.find_agent_factory_pid()