diff --git a/beat/web/backend/models.py b/beat/web/backend/models.py index 9a4d702ecc0472cbac66967ac1aab5773ef8ab2f..9e0ba49db2dbcfdc305a38f6e5a1a85ca35b85e9 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 c24da7822ac37f256780f825f500a30b67783c8b..2b7e9c398ffa3113a2fbc2ea1c5653aa47e3c1d2 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, )