From 3a49ab14dc3b81a54afc336a9e3460587d8b4972 Mon Sep 17 00:00:00 2001
From: Philip Abbet <philip.abbet@idiap.ch>
Date: Thu, 6 Apr 2017 14:21:15 +0200
Subject: [PATCH] Update to beat.core 1.3.0
---
beat/web/backend/models.py | 2 +-
beat/web/experiments/models.py | 13 +++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/beat/web/backend/models.py b/beat/web/backend/models.py
index 9a4d702ec..9e0ba49db 100755
--- a/beat/web/backend/models.py
+++ b/beat/web/backend/models.py
@@ -1389,7 +1389,7 @@ class JobSplit(models.Model):
self.executor = None
- config = simplejson.loads(self.job.block.command)
+ config = simplejson.loads(str(self.job.block.command))
# setup range if necessary
if self.job.block.required_slots > 1:
diff --git a/beat/web/experiments/models.py b/beat/web/experiments/models.py
index c24da7822..2b7e9c398 100644
--- a/beat/web/experiments/models.py
+++ b/beat/web/experiments/models.py
@@ -1140,6 +1140,15 @@ class Block(models.Model):
statistics = self.job.result.stats
+ result_stdout = self.job.result.stdout
+ result_stderr = self.job.result.stderr
+
+ if result_stdout == '\n':
+ result_stdout = ''
+
+ if result_stderr == '\n':
+ result_stderr = ''
+
info = dict(
cpu_time = statistics.cpu['user'] + statistics.cpu['system'],
max_memory = statistics.memory['rss'],
@@ -1149,8 +1158,8 @@ class Block(models.Model):
data_written_size = statistics.data['volume']['write'],
data_written_nb_blocks = statistics.data['blocks']['write'],
data_written_time = statistics.data['time']['write'],
- stdout = self.job.result.stdout,
- stderr = self.job.result.stderr,
+ stdout = result_stdout,
+ stderr = result_stderr,
error_report = self.job.result.usrerr,
)
--
GitLab