service_manager 0.6 → 0.6.2

data/lib/service_manager/service.rb

@@ -1,16 +1,17 @@
 require "thread"
+require "timeout"
 class ServiceManager::Service
   CHDIR_SEMAPHORE = Mutex.new
-  NORMAL_COLOR = 37
+  ANSI_COLOR_RESET = 0
 
-  attr_accessor :name, :host, :port, :cwd, :reload_uri, :start_cmd, :process, :loaded_cue, :timeout, :color
+  attr_accessor :name, :host, :port, :cwd, :reload_uri, :start_cmd, :process, :loaded_cue, :timeout, :color, :pid_file
 
   class ServiceDidntStart < Exception; end
 
   def initialize(options = {})
     options.each { |k,v| send("#{k}=", v) }
     self.host ||= "localhost"
-    self.color ||= NORMAL_COLOR
+    self.color ||= ANSI_COLOR_RESET
     self.timeout ||= 30
     raise ArgumentError, "You need to provide a name for this app service" unless name
   end
@@ -20,7 +21,7 @@ class ServiceManager::Service
   end
 
   def server_info_hash
-    {:name => name, :host => host, :port => port}
+    {:name => name, :host => host, :port => port, :pid_file => pid_file}
   end
 
   def watch_for_cue
@@ -92,12 +93,23 @@ class ServiceManager::Service
 
   # detects if the service is running on the configured host and port (will return true if we weren't the ones who started it)
   def running?
-    TCPSocket.listening_service?(:port => port, :host => host)
+    if pid_file
+      running_via_pid_file?
+    else
+      TCPSocket.listening_service?(:port => port, :host => host)
+    end
   end
 
 protected
+
+  def running_via_pid_file?
+    Process.kill(0, File.read(pid_file).to_i)
+  rescue Errno::ESRCH, Errno::ENOENT
+    return false
+  end
+
   def colorize(output)
-    "\e[0;#{color}m#{output}\e[0;#{NORMAL_COLOR}m"
+    "\e[0;#{color}m#{output}\e[0;#{ANSI_COLOR_RESET}m"
   end
 
   def colorized_service_name
@@ -115,11 +127,21 @@ protected
     else
       start_output_stream_thread
       begin
-        TCPSocket.wait_for_service_with_timeout({:host => host, :port => port, :timeout => timeout})
+        if pid_file
+          wait_for_server_with_timeout
+        else
+          TCPSocket.wait_for_service_with_timeout({:host => host, :port => port, :timeout => timeout})
+        end
       rescue SocketError
         raise ServiceDidntStart
       end
     end
     true
   end
+
+  def wait_for_server_with_timeout
+    Timeout::timeout(timeout) do
+      sleep 0.25 while !running_via_pid_file?
+    end
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: service_manager
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
   - 6
-  version: "0.6"
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Tim Harper
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -06:00
+date: 2011-07-28 00:00:00 -06:00
 default_executable: start_services
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: service_manager