summaryrefslogtreecommitdiff
path: root/trove/common/utils.py
diff options
context:
space:
mode:
authorAmrith Kumar <amrith@tesora.com>2014-12-15 13:59:10 -0500
committeramrith <amrith@tesora.com>2015-02-03 23:26:05 +0000
commit6ea94c4bf73993535625cb6a440919aabcfbb7c6 (patch)
treed17a6a735a268da820b2572853bf44184c6b2c76 /trove/common/utils.py
parent4d31433b1e67acbba1932ba1b032fe55f2dfd00d (diff)
downloadtrove-6ea94c4bf73993535625cb6a440919aabcfbb7c6.tar.gz
resync oslo-incubator code
This commit syncs the following oslo incubator modules used by Trove and all dependent changes. __init__.py 6b048e79 Let oslotest manage the six.move setting for mox context.py 411ba356 Simplify is_user_context method 9b73877b Add a RequestContext.from_dict method 85d1ce6e Python 3: enable tests/unit/middleware/test_request_id.py c0d357bb Add model_query() to db.sqlalchemy.utils module eventlet_backdoor.py a3220c51 add list_opts to all modules with configuration options 5d40e143 Remove code that moved to oslo.i18n 90ae24bf Remove redundant default=None for config options fcf517d7 Update oslo log messages with translation domains ad17a697 Fix filter() usage due to python 3 compability 8b2b0b74 Use hacking import_exceptions for gettextutils._ 12bcdb71 Remove vim header log.py 943cb94a Merge "Make use_syslog=True log to syslog via /dev/log" 8345204c Merge "add list_opts to all modules with configuration options" ac4330dd Make use_syslog=True log to syslog via /dev/log df774ff4 Import PublishErrorsHandler from oslo.messaging a3220c51 add list_opts to all modules with configuration options 6c706c5c Delete graduated serialization files 5d40e143 Remove code that moved to oslo.i18n 6ff6b4b4 Switch oslo-incubator to use oslo.utils and remove old modules aa744115 log: add missing space in error message 037dee00 Set stevedore log level to WARN by default 759bd879 Merge "Set keystonemiddleware and routes.middleware to log on WARN level" 71d072f1 Merge "Except socket.error if syslog isn't running" 37c00918 Add unicode coercion of logged messages to ContextFormatter 66144135 Correct coercion of logged message to unicode loopingcall.py 5d40e143 Remove code that moved to oslo.i18n e3773930 Changes calcuation of variable delay ab5d5f1c Use timestamp in loopingcall bc48099a Log the function name of looping call fb4e863c Remove deprecated LoopingCall fcf517d7 Update oslo log messages with translation domains 8b2b0b74 Use hacking import_exceptions for gettextutils._ 12bcdb71 Remove vim header service.py 5d40e143 Remove code that moved to oslo.i18n 6ede600f rpc, notifier: remove deprecated modules threadgroup.py 1523f000 threadgroup: don't log GreenletExit 5a1a0166 Make stop_timers() method public fdc88831 Add graceful stop function to ThreadGroup.stop 5f8ace05 Merge "threadgroup: use threading rather than greenthread" 2d06d6ca Simple typo correction 4d18b57a threadgroup: use threading rather than greenthread 25ff65e9 Make wait & stop methods work on all threads 12bcdb71 Remove vim header 9d3c34b5 Add a link method to Thread versionutils.py 5d40e143 Remove code that moved to oslo.i18n 1c3ecfcd Enhance versionutils.deprecated to work with classes 7d42c107 Merge "Add Kilo release name to versionutils" 9a462718 Add Kilo release name to versionutils a2ad3a25 Allow deprecated decorator to specify no plan for removal 05ae498b Add JUNO as a target to versionutils module de4adbc4 pep8: fixed multiple violations Closes-Bug: #1366189 Change-Id: I2289452a9b838e22bb6d4dd1a854fbeb326042d2
Diffstat (limited to 'trove/common/utils.py')
-rw-r--r--trove/common/utils.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/trove/common/utils.py b/trove/common/utils.py
index 3fbc5c08..4c98324e 100644
--- a/trove/common/utils.py
+++ b/trove/common/utils.py
@@ -191,7 +191,11 @@ def poll_until(retriever, condition=lambda value: value,
raise loopingcall.LoopingCallDone(retvalue=obj)
if time_out is not None and time.time() - start_time > time_out:
raise exception.PollTimeOut
- lc = loopingcall.LoopingCall(f=poll_and_check).start(sleep_time, True)
+
+ lc = loopingcall.FixedIntervalLoopingCall(
+ f=poll_and_check).start(
+ sleep_time, True)
+
return lc.wait()