almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

livemedia-creator: Log the line that caused the failure

Browse Source 
Sometimes it can be hard to tell exactly what triggered the error
detection, so log the line that matched.
This commit is contained in:
Brian C. Lane 2014-07-02 09:42:49 -07:00
parent 380a6ddd6d
commit ee54cc6c31
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/sbin/livemedia-creator
View File

@ -151,10 +151,12 @@ class LogRequestHandler(SocketServer.BaseRequestHandler):
for t in simple_tests: for t in simple_tests:
if t in line: if t in line:
self.server.log_error = True self.server.log_error = True
self.server.error_line = line
return return
for t in re_tests: for t in re_tests:
if re.search(t, line): if re.search(t, line):
self.server.log_error = True self.server.log_error = True
self.server.error_line = line
return return
@ -168,6 +170,7 @@ class LogServer(SocketServer.TCPServer):
""" """
self.kill = False self.kill = False
self.log_error = False self.log_error = False
self.error_line = ""
self.log_path = log_path self.log_path = log_path
SocketServer.TCPServer.__init__(self, *args, **kwargs) SocketServer.TCPServer.__init__(self, *args, **kwargs)
@ -750,7 +753,7 @@ def virt_install(opts, install_log, disk_img, disk_size):
iso_mount.umount() iso_mount.umount()
if log_monitor.server.log_check(): if log_monitor.server.log_check():
raise InstallError("virt_install failed") raise InstallError("virt_install failed on line: %s" % log_monitor.server.error_line)
if opts.make_fsimage: if opts.make_fsimage:
make_fsimage(diskimg_path, disk_img, disk_size, label=opts.fs_label) make_fsimage(diskimg_path, disk_img, disk_size, label=opts.fs_label)