openstack
/
freezer
Code Issues Proposed changes

Merge "Use LOG.error to record log when initializing LOG"

This commit is contained in:
Jenkins 2016-11-14 14:03:02 +00:00 committed by Gerrit Code Review
parent 0b05f9859d 16ff90ce06
commit bcd67c6117
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
freezer/scheduler/arguments.py
View File

@ -25,7 +25,6 @@ from oslo_config import cfg
from oslo_log import log
CONF = cfg.CONF
_LOG = log.getLogger(__name__)
if winutils.is_windows():
DEFAULT_FREEZER_SCHEDULER_CONF_D = r'C:\.freezer\scheduler\conf.d'
@ -51,14 +50,6 @@ def add_filter():
def get_common_opts():
scheduler_conf_d = os.environ.get('FREEZER_SCHEDULER_CONF_D',
DEFAULT_FREEZER_SCHEDULER_CONF_D)
if not os.path.exists(DEFAULT_FREEZER_SCHEDULER_CONF_D):
try:
os.makedirs(DEFAULT_FREEZER_SCHEDULER_CONF_D)
except OSError as err:
_LOG.error('OS error: {0}'.format(err))
except IOError:
_LOG.error('Cannot create the directory {0}'
.format(scheduler_conf_d))
_COMMON = [
cfg.StrOpt('job',

2
freezer/scheduler/freezer_scheduler.py
View File

@ -31,6 +31,7 @@ from freezer.scheduler import arguments
from freezer.scheduler import scheduler_job
from freezer.scheduler import shell
from freezer.scheduler import utils
from freezer.utils import utils as freezer_utils
from freezer.utils import winutils
if winutils.is_windows():
@ -254,6 +255,7 @@ def main():
print('ERROR {0}'.format(e))
return 70 # os.EX_SOFTWARE
freezer_utils.create_dir(CONF.jobs_dir)
freezer_scheduler = FreezerScheduler(apiclient=apiclient,
interval=int(CONF.interval),
job_path=CONF.jobs_dir)