openstack
/
freezer
Code Issues Proposed changes

Import only modules rather than objects 

Do not import objects, only modules (*)

http://docs.openstack.org/developer/hacking/#imports

Change-Id: I70fdffbe4e83698fefc0d1efa4a627d6c1a6bfa8
This commit is contained in:
howardlee 2016-11-15 18:26:28 +08:00 committed by howard lee
parent ae2b17b1ca
commit 8000e5392c
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
freezer/scheduler/freezer_scheduler.py
View File

@ -35,11 +35,9 @@ from freezer.utils import utils as freezer_utils
from freezer.utils import winutils
if winutils.is_windows():
from win_daemon import Daemon
from win_daemon import NoDaemon
import win_daemon
else:
from daemon import Daemon
from daemon import NoDaemon
import daemon as linux_daemon
CONF = cfg.CONF
LOG = log.getLogger(__name__)
@ -263,15 +261,18 @@ def main():
if CONF.no_daemon:
print('Freezer Scheduler running in no-daemon mode')
LOG.debug('Freezer Scheduler running in no-daemon mode')
daemon = NoDaemon(daemonizable=freezer_scheduler)
if winutils.is_windows():
daemon = win_daemon.NoDaemon(daemonizable=freezer_scheduler)
else:
daemon = linux_daemon.NoDaemon(daemonizable=freezer_scheduler)
else:
if winutils.is_windows():
daemon = Daemon(daemonizable=freezer_scheduler,
interval=int(CONF.interval),
job_path=CONF.jobs_dir,
insecure=CONF.insecure)
daemon = win_daemon.Daemon(daemonizable=freezer_scheduler,
interval=int(CONF.interval),
job_path=CONF.jobs_dir,
insecure=CONF.insecure)
else:
daemon = Daemon(daemonizable=freezer_scheduler)
daemon = linux_daemon.Daemon(daemonizable=freezer_scheduler)
if CONF.action == 'start':
daemon.start()