From 2d106ee58227545abb0c3451591f3ea8958940ff Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Fri, 27 Jul 2018 13:04:10 +0100 Subject: [PATCH] Finally, it works. Now lots more to do! --- src/clj/youyesyet/routes/rest.clj | 7 ++----- src/cljs/youyesyet/canvasser_app/handlers.cljs | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/clj/youyesyet/routes/rest.clj b/src/clj/youyesyet/routes/rest.clj index 0de54d7..c9c4e84 100644 --- a/src/clj/youyesyet/routes/rest.clj +++ b/src/clj/youyesyet/routes/rest.clj @@ -2,6 +2,7 @@ :author "Simon Brooke"} youyesyet.routes.rest (:require [adl-support.core :refer [massage-params do-or-log-error]] [clojure.core.memoize :as memo] + [clojure.data.json :as json] [clojure.java.io :as io] [clojure.string :as s] [clojure.tools.logging :as log] @@ -191,11 +192,7 @@ (if (:result r) {:status 201 - :body (with-out-str - (print - (hash-map - :id (:id (:result r)) - )))} + :body (json/write-str (:result r))} {:status 500 :body (:error r)})) {:status 400 diff --git a/src/cljs/youyesyet/canvasser_app/handlers.cljs b/src/cljs/youyesyet/canvasser_app/handlers.cljs index bfa2d4c..6a8f3ca 100644 --- a/src/cljs/youyesyet/canvasser_app/handlers.cljs +++ b/src/cljs/youyesyet/canvasser_app/handlers.cljs @@ -512,8 +512,8 @@ (reg-event-db :tx-failure - (fn [db _] - (js/console.log (str "Transmission failed, requeueing" (:tx-item db))) + (fn [db [_ response]] + (js/console.log (str "Transmission failed (" response "), requeueing" (:tx-item db))) (assoc (add-to-outqueue db (:tx-item db)) :error "Transmission failed, requeueing")))