Merge branch 'dev'

README.md

@@ -1,7 +1,7 @@
 Current [semantic](http://semver.org/) version:
 
 ```clojure
-[com.taoensso/timbre "1.5.1"]
+[com.taoensso/timbre "1.5.2"]
 ```
 
 # Timbre, a (sane) Clojure logging & profiling library
@@ -27,7 +27,7 @@ Timbre is an attempt to make **simple logging simple** and more **complex loggin
 Depend on Timbre in your `project.clj`:
 
 ```clojure
-[com.taoensso/timbre "1.5.1"]
+[com.taoensso/timbre "1.5.2"]
 ```
 
 and `use` the library:

project.clj

@@ -1,4 +1,4 @@
-(defproject com.taoensso/timbre "1.5.1"
+(defproject com.taoensso/timbre "1.5.2"
   :description "Clojure logging & profiling library"
   :url "https://github.com/ptaoussanis/timbre"
   :license {:name "Eclipse Public License"}

src/taoensso/timbre.clj

@@ -186,7 +186,9 @@
 
 (def get-hostname
   (utils/memoize-ttl
-   60000 (fn [] (.. java.net.InetAddress getLocalHost getHostName))))
+   60000 (fn [] (try (.. java.net.InetAddress getLocalHost getHostName)
+                    (catch java.net.UnknownHostException e
+                      "UnknownHost")))))
 
 (defn- wrap-appender-juxt
   "Wraps compile-time appender juxt with additional runtime capabilities