From f44a743660f55a4e166202f9d8f74fa6d9ec5ce2 Mon Sep 17 00:00:00 2001 From: heyarne Date: Fri, 8 May 2020 11:12:03 +0200 Subject: [PATCH] Proxy shadow-cljs requests to http server and fix http server start --- shadow-cljs.edn | 4 +++- src/heyarne/all_my_friends/server.clj | 9 ++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/shadow-cljs.edn b/shadow-cljs.edn index 5aa96be..7d49f08 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -1,7 +1,9 @@ {:deps {:aliases [:cljs]} :ssl {:keystore "ssl/localhost.jks" :password "shadow-cljs"} - :dev-http {8080 "resources/public"} + :dev-http {8080 + {:root "resources/public" + :proxy-url "http://localhost:8081"}} :builds {:app {:target :browser :output-dir "resources/public/js" diff --git a/src/heyarne/all_my_friends/server.clj b/src/heyarne/all_my_friends/server.clj index b564ae8..bcb8624 100644 --- a/src/heyarne/all_my_friends/server.clj +++ b/src/heyarne/all_my_friends/server.clj @@ -8,8 +8,8 @@ (:gen-class)) (router/defroutes app - (router/POST "/upload" [req] - (println "/upload" req) + (router/POST "/upload" [& args] + (println "/upload" args) {:status 400}) (router/GET "/" [] (slurp (io/resource "public/index.html"))) @@ -24,12 +24,11 @@ (@server :timeout 100) (reset! server nil))) - (defn -main [& args] (println "Starting server on port" (env :port)) (reset! server (-> #'app - (logger/wrap-with-logger - (http/run-server {:port (env :port)}))))) + (logger/wrap-with-logger) + (http/run-server {:port (env :port)})))) #_(-main) #_(stop-server)