chiark / gitweb /
buildserver: display verbose logging in a background tail
authorHans-Christoph Steiner <hans@eds.org>
Mon, 20 Jun 2016 09:33:46 +0000 (11:33 +0200)
committerHans-Christoph Steiner <hans@eds.org>
Tue, 23 May 2017 18:04:08 +0000 (20:04 +0200)
makebuildserver

index 4c196ff040e4c995d526b45a74f2f6fe27aada00..912b5a7766a6f58066cd968f0671f47ebf2a5c1a 100755 (executable)
@@ -11,6 +11,7 @@ import hashlib
 import yaml
 from clint.textui import progress
 from optparse import OptionParser
+import fdroidserver.tail
 
 
 if not os.path.exists('makebuildserver') and not os.path.exists('buildserver'):
@@ -362,9 +363,15 @@ elif os.path.exists('/proc/cpuinfo'):
         config['hwvirtex'] = 'on'
 
 logfilename = os.path.join(serverdir, 'up.log')
+if not os.path.exists(logfilename):
+    open(logfilename, 'a').close()  # create blank file
 log_cm = vagrant.make_file_cm(logfilename)
 v = vagrant.Vagrant(root=serverdir, out_cm=log_cm, err_cm=log_cm)
 
+if options.verbose:
+    tail = fdroidserver.tail.Tail(logfilename)
+    tail.start()
+
 if options.clean:
     v.destroy()
     if config['vm_provider'] == 'libvirt':
@@ -438,3 +445,6 @@ print("Adding box")
 v.box_add('buildserver', boxfile, force=True)
 
 os.remove(boxfile)
+
+if tail is not None:
+    tail.stop()