Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/yada/handler.clj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

(ns yada.handler
(:require
[clojure.tools.logging :refer [errorf]]
[clojure.tools.logging :refer [errorf infof]]
[manifold.deferred :as d]
[schema.core :as s]
[schema.utils :refer [error?]]
Expand Down Expand Up @@ -31,9 +31,14 @@
(let [data (error-data e)]
(when-not (::disable-error-logging? data)
(when-not (and (-> data :status number?) (< (:status data) 500))
(when (instance? java.lang.Throwable e)
(errorf e "Internal Error %s" (or (some-> data :status str) "")))
(when data (errorf "ex-data: %s" (dissoc data :ctx)))))))
(if (= 501 (:status data))
(infof "Unknown method %s %s"
(get-in data [:ctx :method])
(get-in data [:ctx :request :uri]))
(do
(when (instance? java.lang.Throwable e)
(errorf e "Internal Error %s" (or (some-> data :status str) "")))
(when data (errorf "ex-data: %s" (dissoc data :ctx)))))))))

;; Response

Expand Down
30 changes: 24 additions & 6 deletions test/yada/interceptor_test.clj
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
;; Copyright © 2014-2017, JUXT LTD.

(ns yada.interceptor-test
(:require
[clojure.test :refer :all :exclude [deftest]]
[schema.test :refer [deftest]]
[yada.handler
:refer
[append-interceptor insert-interceptor prepend-interceptor]]))
(:require [clojure.test :refer :all :exclude [deftest]]
clojure.tools.logging
[ring.mock.request :as ring-mock]
[schema.test :refer [deftest]]
[yada.handler
:refer
[append-interceptor handler insert-interceptor prepend-interceptor]]
[yada.resource :refer [as-resource]]))

(deftest prepend-interceptor-test
(let [res {:interceptor-chain [:b :c :d :e]}]
Expand All @@ -29,3 +31,19 @@
(= expected (:interceptor-chain f))
(append-interceptor res :c :c1 :c2) [:b :c :c1 :c2 :d :e]
(append-interceptor res :z :d1 :d2) [:b :c :d :e])))

(deftest known-method-logging-test
(let [logs (atom [])]
(with-redefs [clojure.tools.logging/log*
(fn [_ level _ message]
(swap! logs conj [level message]))]
(let [resource "Hello World!"
h (handler (merge (as-resource resource)
{:produces {:media-type "text/plain"
:charset "UTF-8"}}))
request (ring-mock/request :foo "/")
response @(h request)
headers (:headers response)]

(is (= [[:info "Unknown method :foo /"]] @logs))
(is (= 501 (:status response)))))))