From 4ca54c22e0320c579b8914da7d30e45e3eb8dc48 Mon Sep 17 00:00:00 2001 From: Andrea Richiardi Date: Wed, 28 Oct 2015 14:15:45 -0700 Subject: [PATCH] Fix a bug when using port and :from option. Solves #6. --- src/leiningen/simpleton.clj | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/leiningen/simpleton.clj b/src/leiningen/simpleton.clj index 5f3e28b..2f7c8c1 100644 --- a/src/leiningen/simpleton.clj +++ b/src/leiningen/simpleton.clj @@ -138,19 +138,21 @@ (defn ^:no-project-needed simpleton "Starts a simple webserver with the local directory as its root." - [project & [port type _ base]] + [project & [port type from-path base]] (if (= port "version") (show-version) (try (let [port (Integer/parseInt port)] - (println (str "Starting " (if type type "file") " server on port " port)) + (if-not (= ":from" type) + (println (str "Starting " (if type type "file") " server on port " port)) + (println (str "Starting file server on port " port " at " from-path))) (case type "hello" (new-server port "/" (default-handler message)) "echo" (new-server port "/" (echo-handler)) + ":from" (new-server port "/" (fs-handler from-path)) (new-server port "/" (fs-handler base)))) (println) (println @mailbox) (catch NumberFormatException nfe (println "Malformed port" port) (println "Usage: lein simpleton [server-type]"))))) -