diff --git a/rq/worker.py b/rq/worker.py index 37fa15a..25720ff 100644 --- a/rq/worker.py +++ b/rq/worker.py @@ -257,11 +257,9 @@ class Worker(object): p.expire(self.key, 60) p.execute() - def set_warm_shutdown_requested_date(self): - """Sets the date on which the worker received a warm shutdown request""" - with self.connection._pipeline() as p: - p.hset(self.key, 'warm_shutdown_requested_at', utcformat(utcnow())) - p.execute() + def set_shutdown_requested_date(self): + """Sets the date on which the worker received a (warm) shutdown request""" + self.connection.hset(self.key, 'shutdown_requested_date', utcformat(utcnow())) @property def birth_date(self): @@ -271,11 +269,11 @@ class Worker(object): return utcparse(as_text(birth_timestamp)) @property - def warm_shutdown_requested_date(self): - """Fetches warm_shutdown_requested_date from Redis.""" - warm_shutdown_requested_timestamp = self.connection.hget(self.key, 'warm_shutdown_requested_at') - if warm_shutdown_requested_timestamp is not None: - return utcparse(as_text(warm_shutdown_requested_timestamp)) + def shutdown_requested_date(self): + """Fetches shutdown_requested_date from Redis.""" + shutdown_requested_timestamp = self.connection.hget(self.key, 'shutdown_requested_date') + if shutdown_requested_timestamp is not None: + return utcparse(as_text(shutdown_requested_timestamp)) @property def death_date(self): @@ -373,7 +371,7 @@ class Worker(object): # finish before shutting down and save the request in redis if self.get_state() == 'busy': self._stop_requested = True - self.set_warm_shutdown_requested_date() + self.set_shutdown_requested_date() self.log.debug('Stopping after current horse is finished. ' 'Press Ctrl+C again for a cold shutdown.') else: