wip

slapos/runner/utils.py

@@ -744,7 +744,7 @@ def readFileFrom(f, lastPosition, limit=20000):
   # XXX-Marco do now shadow 'bytes'
   bytes = f.tell()
   block = -1
-  data = ""
+  data = b""
   length = bytes
   truncated = False  # True if a part of log data has been truncated
   if (lastPosition <= 0 and length > limit) or (length - lastPosition > limit):

slapos/runner/views.py

@@ -505,7 +505,7 @@ def slapgridResult():
   if request.form['log'] in ['software', 'instance']:
     log_file = request.form['log'] + "_log"
     if os.path.exists(app.config[log_file]):
-      log_result = readFileFrom(open(app.config[log_file]),
+      log_result = readFileFrom(open(app.config[log_file], 'rb'),
                                 int(request.form['position']))
   build_result = getSlapgridResult(app.config, 'software')
   run_result = getSlapgridResult(app.config, 'instance')