Rooba
/
kombu
mirror of https://github.com/celery/kombu.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update timer.py 

Make ```to_timestamp``` monotonic.

Without this fix the countdown and eta examples from the celery docs were not working.

https://github.com/celery/celery/issues/3217
This commit is contained in:
Stuart Axon 2016-06-13 16:02:38 +01:00 committed by Ask Solem
parent 9f5ca4608e
commit 04c10f5ca2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kombu/async/timer.py
View File

@ -20,6 +20,7 @@ from vine.utils import wraps
from kombu.five import monotonic, python_2_unicode_compatible
from kombu.log import get_logger
from time import time as _time
try:
from pytz import utc
@ -37,11 +38,12 @@ IS_PYPY = hasattr(sys, 'pypy_version_info')
scheduled = namedtuple('scheduled', ('eta', 'priority', 'entry'))
def to_timestamp(d, default_timezone=utc):
def to_timestamp(d, default_timezone=utc, time=monotonic):
if isinstance(d, datetime):
if d.tzinfo is None:
d = d.replace(tzinfo=default_timezone)
return max((d - EPOCH).total_seconds(), 0)
diff = _time() - time()
return max((d - EPOCH).total_seconds() - diff, 0)
return d