Add and populate :host and :socket keys on nrepl.server.Server

This fixes an issue that occurs when using the `--interactive` option in
concert with `--socket PATH`. Since the Server object has no :socket
key, nrepl.cmdline/interactive-repl won't recognize that it should
connect to the socket and will exit with an error message.

This also ensures that consumers of the record can obtain the passed-in
host value.

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Bugs fixed
 
 * [#307](https://github.com/nrepl/nrepl/pull/307): Fix issue where TLS accept loop could sometimes exit prematurely. This caused tests to hang sometimes.
+* [#311](https://github.com/nrepl/nrepl/pull/311): Make `--interactive` option work when starting a server on a filesystem socket with `--socket PATH`.
 
 ### Changes
 

src/clojure/nrepl/server.clj

@@ -158,7 +158,7 @@
       (binding [dynamic-loader/*state* state]
         ((:handler @state) msg)))))
 
-(defrecord Server [server-socket port open-transports transport greeting handler]
+(defrecord Server [server-socket host port socket open-transports transport greeting handler]
   java.io.Closeable
   (close [this] (stop-server this)))
 
@@ -211,7 +211,9 @@
                  :else
                  (inet-socket bind port))
         server (Server. ss
+                        (when-not socket bind)
                         (when-not socket (.getLocalPort ^java.net.ServerSocket ss))
+                        socket
                         (atom #{})
                         transport-fn
                         greeting-fn