12:38 a.m.
* Repository: git://roadtrain.codethink.co.uk/baserock/morph
* Branch: liw/log-failed-logs
* Commit: 9121af8cc6bc3f53646c8dd4d7906368c20e0944
Lars Wirzenius (2):
Log to morph's log output of a failed build
Expose the real filename for SaveFile
morphlib/builder2.py | 7 +++++++
morphlib/savefile.py | 6 +++---
morphlib/savefile_tests.py | 8 ++++++++
3 files changed, 18 insertions(+), 3 deletions(-)
--
1.7.2.5
12:39 a.m.
New subject: [PATCH 1/2] Log to morph's log output of a failed build
Normally, the build log would go into the artifact cache, but it's tedious
to fetch from there, so we log it into the normal morph log as well if
things fail.
---
morphlib/builder2.py | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index 03a6214..a5f86e8 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -249,6 +249,7 @@ class ChunkBuilder(BuilderBase):
def build_and_cache(self): # pragma: no cover
with self.build_watch('overall-build'):
mounted = self.do_mounts()
+ log_name = None
try:
builddir = self.staging_area.builddir(self.artifact.source)
self.get_sources(builddir)
@@ -256,9 +257,15 @@ class ChunkBuilder(BuilderBase):
with self.local_artifact_cache.put_source_metadata(
self.artifact.source, self.artifact.cache_key,
'build-log') as log:
+ log_name = log._savefile_filename
self.run_commands(builddir, destdir, log)
except:
self.do_unmounts(mounted)
+ if log_name:
+ with open(log_name) as f:
+ for line in f:
+ logging.error('OUTPUT FROM FAILED BUILD: %s' %
+ line.rstrip('\n'))
raise
self.do_unmounts(mounted)
built_artifacts = self.assemble_chunk_artifacts(destdir)
--
1.7.2.5
12:39 a.m.
New subject: [PATCH 2/2] Expose the real filename for SaveFile
---
morphlib/builder2.py | 2 +-
morphlib/savefile.py | 6 +++---
morphlib/savefile_tests.py | 8 ++++++++
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index a5f86e8..2ae8785 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -257,7 +257,7 @@ class ChunkBuilder(BuilderBase):
with self.local_artifact_cache.put_source_metadata(
self.artifact.source, self.artifact.cache_key,
'build-log') as log:
- log_name = log._savefile_filename
+ log_name = log.real_filename
self.run_commands(builddir, destdir, log)
except:
self.do_unmounts(mounted)
diff --git a/morphlib/savefile.py b/morphlib/savefile.py
index c059066..9392f1a 100644
--- a/morphlib/savefile.py
+++ b/morphlib/savefile.py
@@ -44,7 +44,7 @@ class SaveFile(file):
'''
def __init__(self, filename, *args, **kwargs):
- self._savefile_filename = filename
+ self.real_filename = filename
dirname = os.path.dirname(filename)
fd, self._savefile_tempname = tempfile.mkstemp(dir=dirname)
os.close(fd)
@@ -64,7 +64,7 @@ class SaveFile(file):
def close(self):
ret = file.close(self)
logging.debug('Rename temporary file %s to %s' %
- (self._savefile_tempname, self._savefile_filename))
- os.rename(self._savefile_tempname, self._savefile_filename)
+ (self._savefile_tempname, self.real_filename))
+ os.rename(self._savefile_tempname, self.real_filename)
return ret
diff --git a/morphlib/savefile_tests.py b/morphlib/savefile_tests.py
index 442a077..63c80c9 100644
--- a/morphlib/savefile_tests.py
+++ b/morphlib/savefile_tests.py
@@ -43,6 +43,14 @@ class SaveFileTests(unittest.TestCase):
def test_there_are_no_files_initially(self):
self.assertEqual(os.listdir(self.tempdir), [])
+ def test_sets_real_filename(self):
+ f = savefile.SaveFile(self.filename, 'w')
+ self.assertEqual(f.real_filename, self.filename)
+
+ def test_sets_name_to_temporary_name(self):
+ f = savefile.SaveFile(self.filename, 'w')
+ self.assertNotEqual(f.name, self.filename)
+
def test_saves_new_file(self):
f = savefile.SaveFile(self.filename, 'w')
f.write('foo')
--
1.7.2.5
4088
days inactive
4089
days old
3 comments
2 participants
participants (2)
-
Lars Wirzenius -
Richard Maw