staugaard-cloudmaster 0.1.4 → 0.1.5

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 4
+:patch: 5

data/app/pool_runner.rb

@@ -20,9 +20,6 @@ module Cloudmaster
     def initialize(config)
       @config = config
       @pool_managers = []
-      Signal.trap("INT") do
-        self.shutdown
-      end
     end
 
     # Create each of the pool managers described in the configuration.

data/bin/cloudmaster

@@ -1,45 +1,54 @@
 #!/usr/bin/ruby
 $:.unshift File.expand_path('../app', File.dirname(__FILE__))
 
+require 'rubygems'
+require 'daemons'
 require 'configuration'
 require 'aws_context'
 require 'configuration'
 require 'pool_runner'
 require 'pp'
 
-# Get optional args specifying what server to manage.
-verbose = false
-config_files = []
-opts = []
-args = ARGV
-while args.size > 0
-  a = args.shift
-  case a
-  when "-?": puts "usage: cloudmaster [-v] [-l logfile] [-c configfile] [-p pool]"
-             exit 1
-  when "-v": verbose = true
-  when "-l": logfile = args.shift
-  when "-c": config_files << args.shift
-  when "-p": opts << args.shift.to_sym
+options = {
+  :dir_mode   => :system,
+  :multiple   => false,
+  :ontop      => false,
+  :mode       => :load,
+  :backtrace  => true,
+  :monitor    => false,
+  :log_output => true,
+}
+
+Daemons.run_proc('cloudmaster', options) do
+  # Get optional args specifying what server to manage.
+  verbose = false
+  config_files = []
+  opts = []
+  args = ARGV
+  while args.size > 0
+    a = args.shift
+    case a
+    when "-?": puts "usage: cloudmaster [-v] [-l logfile] [-c configfile] [-p pool]"
+               exit 1
+    when "-v": verbose = true
+    when "-l": logfile = args.shift
+    when "-c": config_files << args.shift
+    when "-p": opts << args.shift.to_sym
+    end
   end
-end
-opts.uniq!
+  opts.uniq!
 
-LoggerFactory.setup(logfile, 'cloudmaster')
-AwsContext.setup(:retry)
+  LoggerFactory.setup(logfile, 'cloudmaster')
+  AwsContext.setup(:retry)
 
-config = Cloudmaster::Configuration.new(config_files, opts)
+  config = Cloudmaster::Configuration.new(config_files, opts)
 
-if verbose
-  puts "Environment: #{config.aws[:aws_env]}" if config.aws[:aws_env]
-  puts "Log file: #{logfile}" if logfile
-  puts "Config file: #{config_files.join(' ')}" if config_files.size > 0
-end
+  if verbose
+    puts "Environment: #{config.aws[:aws_env]}" if config.aws[:aws_env]
+    puts "Log file: #{logfile}" if logfile
+    puts "Config file: #{config_files.join(' ')}" if config_files.size > 0
+  end
 
-Signal.trap("TERM") do
-  # re-read the config file on SIGTERM -- into existing config object
-  config.refresh
+  # Run a pool supervisor
+  Cloudmaster::PoolRunner.new(config).run
 end
-
-# Run a pool supervisor
-Cloudmaster::PoolRunner.new(config).run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: staugaard-cloudmaster
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - cchayden
@@ -11,10 +11,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-20 00:00:00 -07:00
+date: 2009-04-22 00:00:00 -07:00
 default_executable: cloudmaster
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: daemons
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.10
+    version: 
 description: 
 email: mick@staugaard.com
 executables: