Skip to content

Commit 2ecc335

Browse files
committed
Improve error logging
When logging errors also log the message, not just the error-id and possible errors
1 parent 0bb7c68 commit 2ecc335

1 file changed

Lines changed: 21 additions & 17 deletions

File tree

src/clj/mdr2/routes/services.clj

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
(created (str "productions/" (:id p)) {}))
126126
(catch clojure.lang.ExceptionInfo e
127127
(let [{:keys [error-id]} (ex-data e)]
128-
(log/error error-id (ex-message e))
128+
(log/error (ex-message e) error-id)
129129
(case error-id
130130
:duplicate-key (bad-request {:status-text (ex-message e)})
131131
(internal-server-error {:status-text (ex-message e)}))))))}}]
@@ -311,15 +311,16 @@
311311
p (abacus/import-new-production tempfile)]
312312
(created (str "productions/" (:id p)) {}))
313313
(catch clojure.lang.ExceptionInfo e
314-
(let [{:keys [error-id errors]} (ex-data e)]
315-
(log/error error-id errors)
314+
(let [{:keys [error-id errors]} (ex-data e)
315+
message (ex-message e)]
316+
(log/error message error-id errors)
316317
(case error-id
317318
:duplicate-key
318-
(bad-request {:status-text (ex-message e)})
319+
(bad-request {:status-text message})
319320
:invalid-xml
320321
(bad-request {:status-text "Upload of ABACUS XML failed"
321322
:errors errors})
322-
(internal-server-error {:status-text (ex-message e)}))))))}}]
323+
(internal-server-error {:status-text message}))))))}}]
323324
["/recorded"
324325
{:post {:summary "Mark a production as recorded"
325326
:parameters {:multipart {:file multipart/temp-file-part}}
@@ -329,15 +330,16 @@
329330
(abacus/import-recorded-production tempfile)
330331
(no-content)
331332
(catch clojure.lang.ExceptionInfo e
332-
(let [{:keys [error-id errors]} (ex-data e)]
333-
(log/error error-id errors)
333+
(let [{:keys [error-id errors]} (ex-data e)
334+
message (ex-message e)]
335+
(log/error message error-id errors)
334336
(case error-id
335337
:product-not-found (not-found)
336-
:invalid-state (bad-request {:status-text (ex-message e)})
337-
:invalid-daisy-export (bad-request {:status-text (ex-message e)})
338+
:invalid-state (bad-request {:status-text message})
339+
:invalid-daisy-export (bad-request {:status-text message})
338340
:invalid-xml (bad-request {:status-text "Upload of ABACUS XML failed" :errors errors})
339-
:invalid-exported-production (bad-request {:status-text (ex-message e) :errors errors})
340-
(internal-server-error {:status-text (ex-message e)})))))))}}]
341+
:invalid-exported-production (bad-request {:status-text message :errors errors})
342+
(internal-server-error {:status-text message})))))))}}]
341343
["/status"
342344
{:post {:summary "Request the status of a production"
343345
:parameters {:multipart {:file multipart/temp-file-part}}
@@ -347,12 +349,13 @@
347349
(abacus/import-status-request tempfile)
348350
(no-content)
349351
(catch clojure.lang.ExceptionInfo e
350-
(let [{:keys [error-id errors]} (ex-data e)]
351-
(log/error error-id errors)
352+
(let [{:keys [error-id errors]} (ex-data e)
353+
message (ex-message e)]
354+
(log/error message error-id errors)
352355
(case error-id
353356
:product-not-found (not-found)
354357
:invalid-xml (bad-request {:status-text "Upload of ABACUS XML failed" :errors errors})
355-
(internal-server-error {:status-text (ex-message e)})))))))}}]
358+
(internal-server-error {:status-text message})))))))}}]
356359
["/metadata"
357360
{:post {:summary "Update the meta data of a production"
358361
:parameters {:multipart {:file multipart/temp-file-part}}
@@ -362,12 +365,13 @@
362365
(abacus/import-metadata-update tempfile)
363366
(no-content))
364367
(catch clojure.lang.ExceptionInfo e
365-
(let [{:keys [error-id errors]} (ex-data e)]
366-
(log/error error-id errors)
368+
(let [{:keys [error-id errors]} (ex-data e)
369+
message (ex-message e)]
370+
(log/error message error-id errors)
367371
(case error-id
368372
:invalid-xml (bad-request {:status-text "Upload of ABACUS XML failed"
369373
:errors errors})
370-
:product-not-found (not-found {:status-text (ex-message e)})
374+
:product-not-found (not-found {:status-text message})
371375
(internal-server-error))))))}}]]
372376
["/vubis"
373377
{:swagger {:tags ["Upload of Vubis export data"]}}

0 commit comments

Comments
 (0)