Merge pull request #32 from totem/develop

0.3.6 Release
totem · Aug 14, 2015 · ddcba06 · ddcba06
2 parents 756a322 + 4b7dcf0
commit ddcba06
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/deployer/__init__.py b/deployer/__init__.py
@@ -3,7 +3,7 @@
 from celery.signals import setup_logging
 
 
-__version__ = '0.3.5'
+__version__ = '0.3.6'
 __author__ = 'sukrit'
 
 deployer.logger.init_logging()

diff --git a/deployer/tasks/deployment.py b/deployer/tasks/deployment.py
@@ -724,7 +724,7 @@ def _wait_for_stop(self, name, version=None, exclude_version=None,
     check_retries = check_retries or \
         TASK_SETTINGS['DEFAULT_DEPLOYMENT_STOP_CHECK_RETRIES']
     check_interval = max(
-        timout_seconds / check_retries,
+        (timout_seconds / check_retries)+1,
         TASK_SETTINGS['DEPLOYMENT_STOP_MIN_CHECK_RETRY_DELAY']
     )
     try:
@@ -737,7 +737,7 @@ def _wait_for_stop(self, name, version=None, exclude_version=None,
                     not in ('inactive', 'loaded', 'failed')]
     if active_units:
         raise self.retry(exc=NodeNotStopped(name, version, active_units),
-                         max_retries=check_retries,
+                         max_retries=check_retries+1,
                          countdown=check_interval)
     get_store().add_event(
         EVENT_DEPLOYMENTS_STOPPED,