From f8326ef6df07544b5ed8e7085824524db2c325a2 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 14 Aug 2019 14:38:11 -0400
Subject: [PATCH] Add markdown rendering for log mesages

---
 netbox/extras/scripts.py            | 2 +-
 netbox/project-static/css/base.css  | 3 +++
 netbox/templates/extras/script.html | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index 206a53ec4..156d0a4bc 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -269,7 +269,7 @@ def run_script(script, data, commit=True):
     except Exception as e:
         stacktrace = traceback.format_exc()
         script.log_failure(
-            "An exception occurred. {}: {}\n```{}```".format(type(e).__name__, e, stacktrace)
+            "An exception occurred: `{}: {}`\n```\n{}\n```".format(type(e).__name__, e, stacktrace)
         )
         commit = False
     finally:
diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css
index fcee05e12..93e2188ba 100644
--- a/netbox/project-static/css/base.css
+++ b/netbox/project-static/css/base.css
@@ -529,6 +529,9 @@ table.report th a {
     border-top: 1px solid #dddddd;
     padding: 8px;
 }
+.rendered-markdown :last-child {
+    margin-bottom: 0;
+}
 
 /* AJAX loader */
 .loading {
diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index 7a9ddb665..ae1f89b49 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -47,7 +47,7 @@
                                     <tr>
                                         <td>{{ forloop.counter }}</td>
                                         <td>{% log_level level %}</td>
-                                        <td>{{ message }}</td>
+                                        <td class="rendered-markdown">{{ message|gfm }}</td>
                                     </tr>
                                 {% empty %}
                                     <tr>