Skip to content

clojurewebtemplate, branch ofdb: pull request, as discussed #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
j-s-a-m wants to merge 2 commits into
base: ofdb
Choose a base branch
from
Open

clojurewebtemplate, branch ofdb: pull request, as discussed #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b065d2
Procfile added. main method fixed for Heroku
Sep 8, 2014
1e9424f
Merge branch 'ofdb' of github.com:j-s-a-m/clojurewebtemplate into ofdb
Sep 8, 2014
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
1 change: 1 addition & 0 deletions Procfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: lein trampoline run -m clojurewebtemplate.core
10 changes: 5 additions & 5 deletions src/ofdb/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
:workflows [(workflows/interactive-form)]})
handler/site))

(defn -main [& args]
(if-let [port (Integer/parseInt (first args))]
(do (info "starting http-endpoint...")
(run-server siteconfig {:port port})
(info (str "|- http-endpoint ready (" port ")")))))
(defn -main []
(try (let [port (Integer. (System/getenv "PORT"))] (do (info "starting http-endpoint...") (run-server siteconfig {:port port}) (info (str "|- http-endpoint ready (" port ")"))))
(catch Exception e (do (info "PORT not set, using 8080") (run-server siteconfig {:port 8080})))
)
)