particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

guard against mock switching log files under us, so we don't lose important log information

Browse source
This commit is contained in:
Mike Bonnet 2007-03-23 14:16:40 -04:00
parent 9a5da7e9e7
commit 6f6491faa5
1 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

37
builder/kojid
View file

@ -347,7 +347,8 @@ class BuildRoot(object):
self.logger.info(' '.join(cmd))
pid = os.fork()
if pid:
path = self.getUploadPath()
resultdir = self.resultdir()
uploadpath = self.getUploadPath()
logs = {}
while True:
@ -355,29 +356,35 @@ class BuildRoot(object):
time.sleep(1)
try:
results = os.listdir(self.resultdir())
results = os.listdir(resultdir)
except OSError:
# will happen when mock hasn't created the resultdir yet
results = []
continue
for fname in results:
if fname.endswith('.log') and not logs.has_key(fname):
logs[fname] = None
logs[fname] = (None, None)
for (fname, fd) in logs.items():
if not fd:
try:
fd = file(os.path.join(self.resultdir(), fname),'r')
logs[fname] = fd
except:
self.logger.error("Error reading mock log: %s", fname)
self.logger.error(''.join(traceback.format_exception(*sys.exc_info())))
continue
for (fname, (fd, inode)) in logs.items():
try:
fpath = os.path.join(resultdir, fname)
stat_info = os.stat(fpath)
if stat_info.st_ino != inode:
# either a file we haven't opened before, or mock replaced a file we had open with
# a new file and is writing to it, but our fd is pointing to the old file
if fd:
fd.close()
fd = file(fpath, 'r')
logs[fname] = (fd, stat_info.st_ino)
except:
self.logger.error("Error reading mock log: %s", fpath)
self.logger.error(''.join(traceback.format_exception(*sys.exc_info())))
continue
incrementalUpload(fname, fd, path, self.logger)
incrementalUpload(fname, fd, uploadpath, self.logger)
if status[0] != 0:
for (fname, fd) in logs.items():
for (fname, (fd, inode)) in logs.items():
if fd:
fd.close()
return status[1]