service_manager 0.4 → 0.5

data/lib/service_manager.rb

@@ -8,7 +8,10 @@ module ServiceManager
   extend self
 
   def services
-    @services ||= []
+    return @services if @services
+    @services = []
+    load_services
+    @services
   end
 
   def load_services(path = nil)
@@ -27,22 +30,24 @@ module ServiceManager
   end
 
   def services_hash
-    Hash[ServiceManager.services.map { |s| [s.name.to_sym, s]}]
+    Hash[services.map { |s| [s.name.to_sym, s]}]
   end
 
-  def stop(which = :all)
+  # Stop all services.  If service wasn't started by this service manager session, don't try and stop it.
+  def stop
+    return unless services.any? { |s| s.process }
     puts "Stopping the services..."
     services.map {|s| Thread.new { s.stop } }.map(&:join)
   end
 
-  def start(which = :all)
-    load_services
+  # Starts all configured services. If service is detected as running already, don't try and start it.
+  def start
     raise RuntimeError, "No services defined" if services.empty?
     threads = services.map do |s|
       Thread.new do
         begin
           s.start
-        rescue ServiceManager::Service::ServerDidntStart
+        rescue ServiceManager::Service::ServiceDidntStart
           puts "Quitting due to failure."
           exit(1)
         rescue Exception => e

data/lib/service_manager/service.rb

@@ -1,9 +1,11 @@
+require "thread"
 class ServiceManager::Service
+  CHDIR_SEMAPHORE = Mutex.new
   NORMAL_COLOR = 37
 
   attr_accessor :name, :host, :port, :cwd, :reload_uri, :start_cmd, :process, :loaded_cue, :timeout, :color
 
-  class ServerDidntStart < Exception; end
+  class ServiceDidntStart < Exception; end
 
   def initialize(options = {})
     options.each { |k,v| send("#{k}=", v) }
@@ -51,10 +53,12 @@ class ServiceManager::Service
     end
 
     puts "Starting #{colorized_service_name} in #{cwd} with '#{start_cmd}'"
-    Dir.chdir(cwd) do
-      without_bundler_env do
-        # system("bash -c set")
-        self.process = PTYBackgroundProcess.run(start_cmd)
+    CHDIR_SEMAPHORE.synchronize do
+      Dir.chdir(cwd) do
+        without_bundler_env do
+          # system("bash -c set")
+          self.process = PTYBackgroundProcess.run(start_cmd)
+        end
       end
     end
     at_exit { stop }
@@ -62,6 +66,7 @@ class ServiceManager::Service
     puts "Server #{colorized_service_name} is up."
   end
 
+  # stop the service.  If we didn't start it, do nothing.
   def stop
     return unless process
     puts "Shutting down #{colorized_service_name}"
@@ -76,6 +81,7 @@ class ServiceManager::Service
     true
   end
 
+  # reload the service by hitting the configured reload_url. In this case, the service needs to be a web service, and needs to have an action that you can hit, in test mode, that will cause the process to gracefully reload itself.
   def reload
     return false unless reload_uri
     puts "Reloading #{colorized_service_name} app by hitting http://#{host}:#{port}#{reload_uri} ..."
@@ -84,6 +90,7 @@ class ServiceManager::Service
     true
   end
 
+  # 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)
   end
@@ -103,14 +110,14 @@ protected
 
   def wait
     if loaded_cue
-      raise(ServerDidntStart) unless watch_for_cue
+      raise(ServiceDidntStart) unless watch_for_cue
       start_output_stream_thread
     else
       start_output_stream_thread
       begin
         TCPSocket.wait_for_service_with_timeout({:host => host, :port => port, :timeout => timeout})
       rescue SocketError
-        raise ServerDidntStart
+        raise ServiceDidntStart
       end
     end
     true

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: service_manager
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
-  - 4
-  version: "0.4"
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - Tim Harper
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 -06:00
+date: 2010-09-20 00:00:00 -06:00
 default_executable: start_services
 dependencies: 
 - !ruby/object:Gem::Dependency