make stack trace more readable (#1672)

* make stack trace more readable * remove ascii_art import * remove ascii_art.py
apache · Nov 29, 2016 · 3496a80 · 3496a80
1 parent 56b917a
commit 3496a80
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 97 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -27,7 +27,6 @@ exclude_paths:
 - "**.gz"
 - "env/"
 - "tests/"
-- "superset/ascii_art.py"
 - "superset/assets/images/"
 - "superset/assets/vendor/"
 - "superset/assets/node_modules/"

diff --git a/.landscape.yml b/.landscape.yml
@@ -17,7 +17,6 @@ pep8:
 ignore-paths:
     - docs
     - superset/migrations/env.py
-    - superset/ascii_art.py
 ignore-patterns:
     - ^example/doc_.*\.py$
     - (^|/)docs(/|$)
diff --git a/superset/ascii_art.py b/superset/ascii_art.py
diff --git a/superset/cli.py b/superset/cli.py
@@ -13,7 +13,7 @@
 from flask_migrate import MigrateCommand
 from flask_script import Manager
 
-from superset import app, ascii_art, db, data, security
+from superset import app, db, data, security
 
 config = app.config
 
@@ -70,11 +70,10 @@ def init():
 def version(verbose):
     """Prints the current version number"""
     s = (
-        "\n{boat}\n\n"
-        "-----------------------\n"
+        "\n-----------------------\n"
         "Superset {version}\n"
         "-----------------------").format(
-        boat=ascii_art.boat, version=config.get('VERSION_STRING'))
+        version=config.get('VERSION_STRING'))
     print(s)
     if verbose:
         print("[DB] : " + "{}".format(db.engine))

diff --git a/superset/templates/superset/traceback.html b/superset/templates/superset/traceback.html
@@ -1,10 +1,14 @@
 <html>
   <body>
+    <h1>Sorry, something went wrong</h1>
+    <h3>500 - Internal Server Error</h3>
+    <hr>
+    <h2>Stacktrace</h2>
+    <hr>
     <code>
-      <pre>{{ art }}
-{{ title }}
-{{ error_msg }}
-</pre>
+      <pre>
+        {{ error_msg }}
+      </pre>
     </code>
   </body>
 </html>
diff --git a/superset/views.py b/superset/views.py
@@ -36,7 +36,7 @@
 import superset
 from superset import (
     appbuilder, cache, db, models, viz, utils, app,
-    sm, ascii_art, sql_lab, results_backend, security,
+    sm, sql_lab, results_backend, security,
 )
 from superset.source_registry import SourceRegistry
 from superset.models import DatasourceAccessRequest as DAR
@@ -2542,12 +2542,10 @@ def refresh_datasources(self):
 
     @app.errorhandler(500)
     def show_traceback(self):
-        error_msg = get_error_msg()
         return render_template(
             'superset/traceback.html',
-            error_msg=error_msg,
-            title=ascii_art.stacktrace,
-            art=ascii_art.error), 500
+            error_msg=get_error_msg(),
+        ), 500
 
     @expose("/welcome")
     def welcome(self):