← Back to branch summary

~ubuntu-branches/ubuntu/vivid/neutron/vivid-updates

« back to all changes in this revision

Viewing changes to neutron/openstack/common/loopingcall.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2015-03-30 11:17:19 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20150330111719-h0gx7233p4jkkgfh
Tags: 1:2015.1~b3-0ubuntu1
https://launchpad.net/bugs/1263539
* New upstream milestone release:
  - d/control: Align version requirements with upstream.
  - d/control: Add new dependency on oslo-log.
  - d/p/*: Rebase.
  - d/control,d/neutron-plugin-hyperv*: Dropped, decomposed into
    separate project upstream.
  - d/control,d/neutron-plugin-openflow*: Dropped, decomposed into
    separate project upstream.
  - d/neutron-common.install: Add neutron-rootwrap-daemon and 
    neutron-keepalived-state-change binaries.
  - d/rules: Ignore neutron-hyperv-agent when installing; only for Windows.
  - d/neutron-plugin-cisco.install: Drop neutron-cisco-cfg-agent as
    decomposed into separate project upstream.
  - d/neutron-plugin-vmware.install: Drop neutron-check-nsx-config and
    neutron-nsx-manage as decomposed into separate project upstream.
  - d/control: Add dependency on python-neutron-fwaas to neutron-l3-agent.
* d/pydist-overrides: Add overrides for oslo packages.
* d/control: Fixup type in package description (LP: #1263539).
* d/p/fixup-driver-test-execution.patch: Cherry pick fix from upstream VCS
  to support unit test exection in out-of-tree vendor drivers.
* d/neutron-common.postinst: Allow general access to /etc/neutron but limit
  access to root/neutron to /etc/neutron/neutron.conf to support execution
  of unit tests in decomposed vendor drivers.
* d/control: Add dependency on python-neutron-fwaas to neutron-l3-agent
  package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
neutron/openstack/common/loopingcall.py
15
15
#    License for the specific language governing permissions and limitations
16
16
#    under the License.
17
17
 
 
18
import logging
18
19
import sys
19
20
import time
20
21
 
22
23
from eventlet import greenthread
23
24
 
24
25
from neutron.openstack.common._i18n import _LE, _LW
25
 
from neutron.openstack.common import log as logging
26
26
 
27
27
LOG = logging.getLogger(__name__)
28
28
 
84
84
                        break
85
85
                    delay = end - start - interval
86
86
                    if delay > 0:
87
 
                        LOG.warn(_LW('task %(func_name)s run outlasted '
 
87
                        LOG.warn(_LW('task %(func_name)r run outlasted '
88
88
                                     'interval by %(delay).2f sec'),
89
 
                                 {'func_name': repr(self.f), 'delay': delay})
 
89
                                 {'func_name': self.f, 'delay': delay})
90
90
                    greenthread.sleep(-delay if delay < 0 else 0)
91
91
            except LoopingCallDone as e:
92
92
                self.stop()
127
127
 
128
128
                    if periodic_interval_max is not None:
129
129
                        idle = min(idle, periodic_interval_max)
130
 
                    LOG.debug('Dynamic looping call %(func_name)s sleeping '
 
130
                    LOG.debug('Dynamic looping call %(func_name)r sleeping '
131
131
                              'for %(idle).02f seconds',
132
 
                              {'func_name': repr(self.f), 'idle': idle})
 
132
                              {'func_name': self.f, 'idle': idle})
133
133
                    greenthread.sleep(idle)
134
134
            except LoopingCallDone as e:
135
135
                self.stop()