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

fix display of simpy3 exceptions in the GUI

parent 51697e57
...@@ -32,6 +32,7 @@ from dream.plugins.plugin import PluginRegistry ...@@ -32,6 +32,7 @@ from dream.plugins.plugin import PluginRegistry
import os.path import os.path
import logging import logging
import simpy
from flask import Flask, jsonify, redirect, url_for from flask import Flask, jsonify, redirect, url_for
from flask import request from flask import request
...@@ -135,7 +136,13 @@ def _runSimulation(parameter_dict): ...@@ -135,7 +136,13 @@ def _runSimulation(parameter_dict):
try: try:
registry = PluginRegistry(app.logger, parameter_dict) registry = PluginRegistry(app.logger, parameter_dict)
return dict(success=True, data=registry.run(parameter_dict)) return dict(success=True, data=registry.run(parameter_dict))
except Exception, e: except Exception:
# Use simpy._compat to format exception chain in python2
if hasattr(simpy._compat, 'format_chain'):
exc_type, exc_value, exc_traceback = sys.exc_info()
tb = ''.join(simpy._compat.format_chain(exc_type, exc_value, exc_traceback))
else:
assert sys.version_info[0] == 3
tb = traceback.format_exc() tb = traceback.format_exc()
app.logger.error(tb) app.logger.error(tb)
return dict(error=tb) return dict(error=tb)
......
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