Merge branch 'master' of https://github.com/ctreffe/mortimer

ctreffe · Jul 23, 2020 · 8742945 · 8742945
2 parents 0873fa5 + f60a10d
commit 8742945
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## Mortimer v0.6.1 (Released 2020-07-23)
+
+### Fixed
+
+* Fixed a bug that prevented correct logging of exceptions occuring during experiment execution.
+
+* Fixed a bug that messed up the layout of the experiment page for inactive experiments.
+
 ## Mortimer v0.6.0 (Released 2020-07-13)
 
 ### Changed

diff --git a/src/mortimer/templates/experiment.html b/src/mortimer/templates/experiment.html
@@ -4,10 +4,12 @@
 <div>
   <h1>{{ experiment.title }}</h1>
 
-  {% if experiment.active == True %}
-
   <div class="row">
     <div class="col">
+
+      {% if experiment.active == True %}
+
+
       <div class="input-group mb-3">
         <div class="input-group-prepend">
           <form method="POST"

diff --git a/src/mortimer/web_experiments/alfredo.py b/src/mortimer/web_experiments/alfredo.py
@@ -269,14 +269,11 @@ def experiment():
             resp.cache_control.no_cache = True
             return resp
     except Exception:
-        log = alfredlog.QueuedLoggingInterface("alfred3", f"exp.{str(experiment.id)}")
+        log = alfredlog.QueuedLoggingInterface("alfred3", f"exp.{str(experiment.exp_id)}")
         log.session_id = sid
         log.exception("Exception during experiment execution.")
-        # raise e
-        # logger.critical(
-        #     msg=traceback.format_exc(), exp_id=str(experiment.exp_id), session_id=sid
-        # )
-        return render_template("errors/500_alfred.html")
+
+        abort(500)
 
 
 @alfredo.route("/staticfile/<identifier>")