Adjusted how we handle obtaining running VM ip address. Working on da…

…emonizing the daod process.

bin/daod

@@ -5,4 +5,5 @@ $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
 require 'dao'
 
+Process.daemon
 Dao::Base.new.run

lib/dao.rb

@@ -21,7 +21,7 @@ def run
 
       loop do
         begin
-          ip = `docker-machine ip dao-dev`.strip # gross.
+          ip = get_ip_from_vm('dao-dev') || exit!
           old_ports = servers.map(&:port)
           mappings = Dao::PortMapper.create(ip, containers.matching)
 
@@ -46,5 +46,13 @@ def run
         end
       end
     end
+
+    def get_ip_from_vm(name)
+      ip = `docker-machine ip #{name}`.strip
+
+      if ip =~ /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/
+        ip
+      end
+    end
   end
 end

scripts/dao

@@ -10,10 +10,12 @@ case "$1" in
     docker-machine ssh dao-dev sudo "sed -r \"s/EXTRA_ARGS='(.*?)'/EXTRA_ARGS='\1 --bip 10.100.200.1\/24'/\" /var/lib/boot2docker/profile > tmp && sudo mv tmp /var/lib/boot2docker/profile"
     docker-machine stop dao-dev
     docker-machine start dao-dev
+    pgrep -f 'daod' || daod
     ;;
 
   start)
     docker-machine start dao-dev
+    pgrep -f 'daod' || daod
     ;;
 
   stop)