From ae6c5a4e257906c6a45bccb618ecee26a862398b Mon Sep 17 00:00:00 2001
From: Cam Saul <cam@getluckybird.com>
Date: Thu, 19 Mar 2015 18:56:22 -0700
Subject: [PATCH] don't log empty API call bodies. Show the title of an
annotation
---
.../app/annotation/partials/annotation_form.html | 2 +-
src/metabase/middleware/log_api_call.clj | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/resources/frontend_client/app/annotation/partials/annotation_form.html b/resources/frontend_client/app/annotation/partials/annotation_form.html
index 90bb0560fb0..a8816394bf5 100644
--- a/resources/frontend_client/app/annotation/partials/annotation_form.html
+++ b/resources/frontend_client/app/annotation/partials/annotation_form.html
@@ -14,7 +14,7 @@
<span class="text-grey-3"> added an annotation for </span>
<span class="text-brand">{{getAnnotationTimeframe(annotation)}}</span>
</p>
-
+ <p class="text-grey-5">{{annotation.title}}</p>
<p class="text-grey-4">{{annotation.body}}</p>
</div>
</li>
diff --git a/src/metabase/middleware/log_api_call.clj b/src/metabase/middleware/log_api_call.clj
index 6f56bb6d920..960dbed8d78 100644
--- a/src/metabase/middleware/log_api_call.clj
+++ b/src/metabase/middleware/log_api_call.clj
@@ -42,13 +42,13 @@
(defn- log-request [{:keys [uri request-method body]}]
(log/debug (color/blue (format "%s %s " (.toUpperCase (name request-method)) uri)
- (when-let [body-output (with-out-str (pprint body))]
- (str "\n" body-output)))))
+ (when (or (string? body) (coll? body))
+ (str "\n" (with-out-str (pprint body)))))))
(defn- log-response [{:keys [uri request-method]} {:keys [status body]} elapsed-time]
(let [error? (>= status 400)
color-fn (if error? color/red color/green)]
(log/debug (color-fn (format "%s %s %d (%d ms)" (.toUpperCase (name request-method)) uri status elapsed-time)
(when (or error? (not only-display-output-on-error))
- (when-let [body-output (with-out-str (pprint body))]
- (str "\n" body-output)))))))
+ (when (or (string? body) (coll? body))
+ (str "\n" (with-out-str (pprint body)))))))))
--
GitLab