name required, as in docs, get-host-ip made public as it can be part of id

Author: Oleg Noga

src/consul/agent.clj

@@ -73,7 +73,7 @@
                       (default-callback response))))))
 
 
-(defn- get-host-ip []
+(defn get-host-ip []
   (try
     (let [consul-url (URL. *consul-url*)]
       (-> (doto (DatagramSocket.)
@@ -86,19 +86,19 @@
 
 
 (defn- register-request [{:keys [id name address port ttl deregister-critical-service-after]}]
-  {:id      id
-   :name    (or name id)
+  {:name    name
+   :id      (or id name)
    :address (or address (get-host-ip))
    :port    port
-   :check   {:CheckId                        (str id ":ttl-check")
+   :check   {:CheckId                        (str id "/ttl-check")
              :TTL                            ttl
              :DeregisterCriticalServiceAfter deregister-critical-service-after}})
 
 
 (defn heartbeat
   "single heartbeat"
   [params]
-  (check-update-with-register (str (:id params) ":ttl-check")
+  (check-update-with-register (str (:id params) "/ttl-check")
                               :passing
                               (register-request params)))