diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-31 02:16:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-31 02:16:27 +0000 |
| commit | 1a3e284c2bce59c7aeb87ee2e5d53fb3c79400b0 (patch) | |
| tree | da95db0b9de2b5e7a6ece0dc3039cd9e4f729c7b | |
| parent | 6fcde0dab1d8590cecfbbe942704e6848e366584 (diff) | |
| parent | 991be99c894f249cada7035d7fff1909e02d89e5 (diff) | |
| download | kolla-1a3e284c2bce59c7aeb87ee2e5d53fb3c79400b0.tar.gz kolla-1a3e284c2bce59c7aeb87ee2e5d53fb3c79400b0.zip | |
Merge "Make the logging more safe"
| -rw-r--r-- | docker/base/set_configs.py | 3 | ||||
| -rwxr-xr-x | kolla/cmd/build.py | 8 | ||||
| -rw-r--r-- | 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 cbcf54e16..6da2704b9 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 33627a859..842967d54 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 e72438299..6aaf98652 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 @@ -53,15 +53,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) |