Commit 4407749e authored by Nicolas Wavrant's avatar Nicolas Wavrant

runner: getSlapgridResult shouldn't return 500 in case of issue

parent cfda77c9
...@@ -341,10 +341,16 @@ def isSoftwareRunning(config): ...@@ -341,10 +341,16 @@ def isSoftwareRunning(config):
def getSlapgridResult(config, step): def getSlapgridResult(config, step):
filename = step + "_info.json" filename = step + "_info.json"
file = os.path.join(config['runner_workdir'], filename) file = os.path.join(config['runner_workdir'], filename)
result = {'last_build': 0, 'success':-1}
if os.path.exists(file): if os.path.exists(file):
result = json.loads(open(file, "r").read()) try:
else: with open(file, "r") as f:
result = {'last_build': 0, 'success':-1} result = json.loads(f.read())
except ValueError:
# It seems this call can fail with
# ValueError("No JSON object could be decoded")
# Probably the file is being written at the same time ?
pass
return result return result
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment