Commit c4bc622a authored by Jérome Perrin's avatar Jérome Perrin

make process timeout configurable, keeping the 60s default value

parent 8708a441
...@@ -20,7 +20,7 @@ def runSimulation(): ...@@ -20,7 +20,7 @@ def runSimulation():
app.logger.debug("running with:\n%s" % (pformat(parameter_dict,))) app.logger.debug("running with:\n%s" % (pformat(parameter_dict,)))
try: try:
timeout = int(parameter_dict['general']['simulationTimeout']) timeout = int(parameter_dict['general']['processTimeout'])
except (KeyError, ValueError, TypeError): except (KeyError, ValueError, TypeError):
timeout = 60 timeout = 60
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
numberOfReplications: {id: "numberOfReplications", type: "string", _class: "Dream.Property", default: "10"}, numberOfReplications: {id: "numberOfReplications", type: "string", _class: "Dream.Property", default: "10"},
maxSimTime: {id: "maxSimTime", type: "string", _class: "Dream.Property", default: "100"}, maxSimTime: {id: "maxSimTime", type: "string", _class: "Dream.Property", default: "100"},
confidenceLevel: {id: "confidenceLevel", type: "string", _class: "Dream.Property", default: "0.5"}, confidenceLevel: {id: "confidenceLevel", type: "string", _class: "Dream.Property", default: "0.5"},
processTimeout: {id: "processTimeout", type: "string", _class: "Dream.Property", default: "0.5"},
}; };
property_container["interarrivalTime"] = {id:"interarrivalTime", property_container["interarrivalTime"] = {id:"interarrivalTime",
property_list: [property_container["mean"], property_container["distributionType"]], property_list: [property_container["mean"], property_container["distributionType"]],
...@@ -59,7 +60,8 @@ ...@@ -59,7 +60,8 @@
}, },
"Dream-Configuration": { property_list: [ property_container["numberOfReplications"], "Dream-Configuration": { property_list: [ property_container["numberOfReplications"],
property_container["maxSimTime"], property_container["maxSimTime"],
property_container["confidenceLevel"], ], property_container["confidenceLevel"],
property_container["processTimeout"], ],
_class: 'Dream.Repairman', }, _class: 'Dream.Repairman', },
} }
......
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