diff options
| author | Devananda van der Veen <devananda.vdv@gmail.com> | 2013-11-14 21:26:16 -0800 |
|---|---|---|
| committer | Devananda van der Veen <devananda.vdv@gmail.com> | 2013-11-18 14:42:14 -0800 |
| commit | 56928bdd905a36dea379c203421a30ec12a53e78 (patch) | |
| tree | ac37a25e70ae7c0ff19c2213e4776c3c626f3d8d /ironic/openstack | |
| parent | bea0d484257b346fb8b0617dcbd6c66b18e746e2 (diff) | |
| download | ironic-56928bdd905a36dea379c203421a30ec12a53e78.tar.gz | |
sync common.periodic_task from oslo
Change-Id: I48893105877d18534099096a13da852e3e3ecbc2
Diffstat (limited to 'ironic/openstack')
| -rw-r--r-- | ironic/openstack/common/periodic_task.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ironic/openstack/common/periodic_task.py b/ironic/openstack/common/periodic_task.py index f569e988e..f14a24da7 100644 --- a/ironic/openstack/common/periodic_task.py +++ b/ironic/openstack/common/periodic_task.py @@ -17,8 +17,9 @@ import datetime import time from oslo.config import cfg +import six -from ironic.openstack.common.gettextutils import _ +from ironic.openstack.common.gettextutils import _ # noqa from ironic.openstack.common import log as logging from ironic.openstack.common import timeutils @@ -150,8 +151,8 @@ class _PeriodicTasksMeta(type): cls._periodic_last_run[name] = task._periodic_last_run +@six.add_metaclass(_PeriodicTasksMeta) class PeriodicTasks(object): - __metaclass__ = _PeriodicTasksMeta def run_periodic_tasks(self, context, raise_on_error=False): """Tasks to be run at a periodic interval.""" @@ -173,7 +174,8 @@ class PeriodicTasks(object): if spacing is not None: idle_for = min(idle_for, spacing) - LOG.debug(_("Running periodic task %(full_task_name)s"), locals()) + LOG.debug(_("Running periodic task %(full_task_name)s"), + {"full_task_name": full_task_name}) self._periodic_last_run[task_name] = timeutils.utcnow() try: @@ -182,7 +184,7 @@ class PeriodicTasks(object): if raise_on_error: raise LOG.exception(_("Error during %(full_task_name)s: %(e)s"), - locals()) + {"full_task_name": full_task_name, "e": e}) time.sleep(0) return idle_for |