openstack/freezer
Code Issues Proposed changes

Optimise the code for log directory created

Browse Source 
Change-Id: Icfab4d3e916c570b2887944cfc7a907f8991bfe2
This commit is contained in:
caoyuan 2018-01-23 13:57:11 +08:00
parent 888aad13ce
commit c9d8639e2a
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
freezer/common/config.py
View File

@ -579,29 +579,24 @@ def get_backup_args():
if not CONF.get('log_file'):
log_file = None
for file_name in ['/var/log/freezer-agent/freezer-agent.log',
'/var/log/freezer.log']:
try:
log_file = prepare_logging(file_name)
except IOError:
pass
file_name = '/var/log/freezer-agent/freezer-agent.log'
try:
log_file = prepare_logging(file_name)
except IOError:
pass
if not log_file:
# Set default working directory to ~/.freezer. If the directory
# does not exists it is created
work_dir = os.path.join(home, '.freezer')
if not os.path.exists(work_dir):
try:
os.makedirs(work_dir)
log_file = prepare_logging(os.path.join(work_dir,
'freezer.log'))
except (OSError, IOError) as err_msg:
# This avoids freezer-agent to crash if it can't write to
# ~/.freezer, which may happen on some env (for me,
# it happens in Jenkins, as freezer-agent can't write to
# /var/lib/jenkins).
print(encodeutils.safe_decode('{}'.format(err_msg)),
file=sys.stderr)
try:
log_file = prepare_logging()
except (OSError, IOError) as err_msg:
# This avoids freezer-agent to crash if it can't write to
# ~/.freezer, which may happen on some env (for me,
# it happens in Jenkins, as freezer-agent can't write to
# /var/lib/jenkins).
print(encodeutils.safe_decode('{}'.format(err_msg)),
file=sys.stderr)
if log_file:
CONF.set_default('log_file', log_file)
else: