amiral 0.1.3 → 0.1.4

data/amiral.gemspec

@@ -21,6 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'facter'
   gem.add_dependency 'awesome_print'
   gem.add_dependency 'uuidtools'
-  gem.add_dependency 'daemons'
   gem.add_dependency 'popen4'
 end

data/bin/amiral.rb

@@ -15,8 +15,6 @@ options.logfile = "amiral.log"
 options.host = "localhost"
 options.port = 6379
 options.match_spec = {:all => true}
-options.foreground = false
-options.rundir = "."
 options.loglevel = Logger::INFO
 
 opts = OptionParser.new do |opts|
@@ -35,7 +33,7 @@ opts = OptionParser.new do |opts|
     end
   end
 
-  opts.on("-l", "--log-level [level]", String, "log level") do |level|
+  opts.on("-L", "--log-level [level]", String, "log level") do |level|
     case level
     when "debug"
       options.loglevel = Logger::DEBUG
@@ -72,12 +70,8 @@ opts = OptionParser.new do |opts|
     options.queue_ack = aqueue
   end
 
-  opts.on("-r", "--rundir [directory]", String, "agent run directory") do |rundir|
-    options.rundir = rundir
-  end
-
-  opts.on("-f", "--[no-]foreground") do |foreground|
-    options.foreground = foreground
+  opts.on("-l", "--log [logfile]", String, "log file path") do |logfile|
+    options.logfile = logfile
   end
 
   opts.on("-m", "--match [filter]", String, "node match filter") do |matcher|

data/lib/amiral/version.rb

@@ -1,3 +1,3 @@
 module Amiral
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/amiral.rb

@@ -6,7 +6,6 @@ require 'json'
 require 'facter'
 require 'uuidtools'
 require 'awesome_print'
-require 'daemons'
 require 'logger'
 require 'popen4'
 
@@ -51,13 +50,13 @@ module Amiral
         }
         short = "unknown status"
         case status.exitstatus
-        when 0:
+        when 0
             short = "nothing to do, i'm all good"
-        when 2:
+        when 2
             short = "successfully applied changes"
-        when 4:
+        when 4
             short = "encountered catalog application errors"
-        when 6:
+        when 6
             short = "errors encountered, managed to apply some changes"
         end
             
@@ -263,10 +262,10 @@ module Amiral
         :keytype => :dss,
         :hostname => hostname,
         :loglevel => Logger::INFO,
-        :rundir => "."
+        :logfile => "amiral.log",
       }.merge settings
 
-      @logger = Logger.new(STDOUT)
+      @logger = Logger.new(@settings[:logfile])
       @logger.level = @settings[:loglevel]
 
       raise "need key path" unless @settings[:keypath]
@@ -281,15 +280,7 @@ module Amiral
 
     def run args
       begin
-        Daemons.daemonize({:backtrace => true,
-                            :ontop => @settings[:foreground],
-                            :dir_mode => :normal,
-                            :dir => @settings[:rundir],
-                            :app_name => "amiral-agent",
-                            :log_output => true})
         listen
-      rescue SystemExit => err
-        @logger.debug("agent starting")
       rescue Exception => err
         @logger.fatal("caught exception, exiting")
         @logger.fatal(err)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amiral
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -91,22 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: daemons
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: popen4
   requirement: !ruby/object:Gem::Requirement