From 991be99c894f249cada7035d7fff1909e02d89e5 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Tue, 29 Dec 2015 15:26:45 +0800
Subject: [PATCH] Make the logging more safe
TrivialFix
Change-Id: I72c541c1846e503486b402e88d5b29364920fc83
---
docker/base/set_configs.py | 3 ++-
kolla/cmd/build.py | 8 ++++----
tests/test_build.py | 8 ++++----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/docker/base/set_configs.py b/docker/base/set_configs.py
index cbcf54e163..6da2704b9d 100644
--- a/docker/base/set_configs.py
+++ b/docker/base/set_configs.py
@@ -172,7 +172,8 @@ def set_permissions(data):
os.chown(file_, uid, gid)
os.chmod(file_, perm)
except OSError as e:
- LOG.error("Error while setting permissions for %s: %r", file_, e)
+ LOG.error("Error while setting permissions for %s: %r",
+ file_, repr(e))
sys.exit(1)
dest = data.get('dest')
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py
index 33627a859f..842967d54a 100755
--- a/kolla/cmd/build.py
+++ b/kolla/cmd/build.py
@@ -138,10 +138,10 @@ class WorkerThread(Thread):
if image['status'] in ['built', 'unmatched',
'parent_error']:
break
- except ConnectionError as e:
- LOG.error(e)
- LOG.error('Make sure Docker is running and that you have '
- 'the correct privileges to run Docker (root)')
+ except ConnectionError:
+ LOG.exception('Make sure Docker is running and that you'
+ ' have the correct privileges to run Docker'
+ ' (root)')
image['status'] = "connection_error"
break
self.end_task(image)
diff --git a/tests/test_build.py b/tests/test_build.py
index e0827eec3e..79ee54ca55 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -35,7 +35,7 @@ class BuildTest(base.BaseTestCase):
def runTest(self):
with patch.object(sys, 'argv', self.build_args):
- LOG.info("Running with args %s" % self.build_args)
+ LOG.info("Running with args %s", self.build_args)
bad_results, good_results, unmatched_results = build.main()
# these are images that are known to not build properly
@@ -52,15 +52,15 @@ class BuildTest(base.BaseTestCase):
failures = failures + 1
LOG.warning(">>> Expected image '%s' to fail, please update"
" the excluded_images in source file above if the"
- " image build has been fixed." % image)
+ " image build has been fixed.", image)
else:
if result is not 'error':
continue
failures = failures + 1
- LOG.critical(">>> Expected image '%s' to succeed!" % image)
+ LOG.critical(">>> Expected image '%s' to succeed!", image)
for image in unmatched_results.keys():
- LOG.warning(">>> Image '%s' was not matched" % image)
+ LOG.warning(">>> Image '%s' was not matched", image)
self.assertEqual(failures, 0, "%d failure(s) occurred" % failures)
--
GitLab