Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion provider/consumer.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@
from urlparse import urlparse
from authHandler import IAMAuth
from requests.auth import HTTPBasicAuth
from datetime import datetime, timedelta

local_dev = os.getenv('LOCAL_DEV', 'False')
payload_limit = int(os.getenv('PAYLOAD_LIMIT', 900000))
check_ssl = (local_dev == 'False')
seconds_in_day = 86400

processingManager = Manager()

Expand Down Expand Up @@ -66,6 +68,7 @@ def __init__(self, trigger, params):

self.process = ConsumerProcess(trigger, params, self.sharedDictionary)
self.__restartCount = 0
self.__lastRestart = datetime.now()

def currentState(self):
return self.sharedDictionary['currentState']
Expand Down Expand Up @@ -96,7 +99,13 @@ def restart(self):
logging.info('[{}] Request to restart a consumer that is already slated for deletion.'.format(self.trigger))
return

self.__restartCount += 1
timeBetweenRestarts = datetime.now() - self.__lastRestart
self.__lastRestart = datetime.now()

if timeBetweenRestarts.total_seconds() >= seconds_in_day:
self.__restartCount = 1
else:
self.__restartCount += 1

logging.info('[{}] Quietly shutting down consumer for restart'.format(self.trigger))
self.setDesiredState(Consumer.State.Restart)
Expand Down