erlnixify 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDgwYzhmNGFiZDhjMzllYWE2ZjBmZDQ4NjQyM2RmOTA3NzE5MmY1Ng==
+    MzMyZjgxN2IxNDliNTAyOWY2MGI0MzQ5MzQyMDkzZTcyNTAwNDE4OQ==
   data.tar.gz: !binary |-
-    MDRjNmJjNjVmYmViNWE2ZTliMDJjMmRiOTJhYTM1ZmY5NTU4YThhYQ==
+    NTU4NDIzMDA0NDFmNGYzMGNhNTY1MmNlNmMzM2UwZWJmMjY0MTkxZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzJjMTA4NzQ3OTRhODgzNTBkOTBkZGJlY2NlNmM2ZGY3OGRmZGMzZjBjNzUw
-    YWJkNjI5NmFiODJhY2MzZWI1ZmRiNzQ0MGIxOTdiYTkxNzY5YjVhNDYzZGJh
-    M2VkODEzNjNjZjk5YmVlMGIxYjMxM2NhZjk4YzJkNjdiNzVjMDE=
+    N2IxYTAxODg4YWM1MThiYWRjMTcwYzI4NzRkZGNjOTY3NDQ5Njk1ZjEyMGFm
+    ZDFkOGMzNjRlNDdlMzMwNGIzY2U0NTUzNTc5MDI1OTI1YWZlNjVjZTYxOWY3
+    ODIzODQ1ZTBkNTdkZmU1YWVjZGZlZjkyZmM4YzZhMTY4MzE0ODQ=
   data.tar.gz: !binary |-
-    MWY4YWExN2I0ZTBmNzg1M2Y3ZWZhNzcwOGFkY2EzZGI4ZmYxZjY1YjFiMzdl
-    YjdiMDhiMzdkMDdmMTk1ZmFlMTcxNGQyMzdiNTIzOTljZmEzOWEwYjQ2MmNk
-    OTZhNGEzNmRjM2E5ZWMzYTg3M2QwMTE1ZDhhNWYzZmI4YmViNTI=
+    MWMyNWY2ZWQ4MTNiMjMzMjgwMzU0ZGZlMzZkNjk1Yjk2NjI4OTBmZTVlMWFj
+    ODhlNWZiNGMwOTk2YTlhNDY1MTYwNzNiNmMzMTc2Y2I2MGZlYjg1MTU3ZWUw
+    NmY1OGRhMzVlNDdiMmFjNzY1NmIwOWMyODQ5NDcwMWQzNzU2ODU=

data/lib/erlnixify/node.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'timeout'
 require 'erlnixify/exceptions'
 
 module Erlnixify
@@ -24,27 +25,52 @@ module Erlnixify
       @log = Logger.new(STDOUT)
       @log.level = Logger::DEBUG
 
+    end
+
+    def start
+      self.start_deamon
+
       Signal.trap("TERM") do
-        self.halt_nicely
+        # This is going to propagate to the running erlang
+        # node. Unfortunately, there is no way to stop that that I
+        # have found yet. Hopefully, in the near future we can resolve
+        # that.
         raise NodeError, "SIGTERM recieved, shutting down"
       end
 
       Signal.trap("INT") do
-        self.halt_nicely
+        # This is going to propagate to the running erlang
+        # node. Unfortunately, there is no way to stop that that I
+        # have found yet. Hopefully, in the near future we can resolve
+        # that.
         raise NodeError, "SIGINT recieved, shutting down"
       end
 
       at_exit { self.external_kill }
+
+      @log.debug "waiting for #{@settings[:startuptimeout]} seconds for startup"
+      sleep @settings[:startuptimeout]
+      self.monitor
     end
 
-    def start
-      @log.debug "starting process"
+    def start_deamon
+      begin
+        self.status
+      rescue NodeError => msg
+        return self.raw_start_deamon
+      end
+      raise NodeError, "Already started"
+    end
+
+    def raw_start_deamon
+      @log.debug "starting daemon"
       env = {}
       env["HOME"] = @settings[:home] if @settings[:home]
 
       begin
         @log.debug "spawning command '#{@command}' with #{env}"
         @pid = Process.spawn(env, @command)
+        Process.detach @pid
       rescue Errno::ENOENT
         @log.debug "Invalid command provided, raising error"
         raise NodeError, "Command does not exist"
@@ -52,7 +78,7 @@ module Erlnixify
 
       @log.debug "waiting for #{@settings[:startuptimeout]} seconds for startup"
       sleep @settings[:startuptimeout]
-      self.monitor
+      self.status
     end
 
     def monitor
@@ -80,15 +106,27 @@ module Erlnixify
       end
     end
 
+    def status
+      begin
+        Timeout.timeout(@settings[:checktimeout]) do
+            self.raw_check
+        end
+      rescue Timeout::Error
+        self.halt_nicely
+        raise NodeError, "Check command timeout occurred"
+      end
+    end
+
     def raw_check
-      @log.debug "Checking the status of Pid #{@pid}"
       @log.debug "#{@check_command} =~ #{@checkregex}"
       result = `#{@check_command}`
-      @log.debug "got #{result}"
+      @log.debug "result #{result}"
       if not (result =~ @checkregex)
-        @log.debug "Check failed, halting system"
+        @log.info "invalid state"
         self.halt_nicely
         raise NodeError, "Node check failed"
+      else
+        @log.info "running"
       end
     end
 
@@ -106,24 +144,39 @@ module Erlnixify
       end
     end
 
-    def halt_nicely
+    def stop
+      @log.debug "Executing halt nicely: #{@halt_command}"
       `#{@halt_command}`
-      sleep @settings[:checkinterval]
+      if not $?
+        sleep @settings[:checkinterval]
+      else
+        raise NodeError, "Got status #{$?}"
+      end
+    end
+
+    def halt_nicely
       if self.is_running?
+        @log.debug "Executing halt nicely: #{@halt_command}"
+        `#{@halt_command}`
+        sleep @settings[:checkinterval]
         self.halt_brutally
       end
     end
 
     def halt_brutally
-      `#{@brutal_halt_command}`
-      sleep @settings[:checkinterval]
       if self.is_running?
+        @log.debug "Executing halt brutally: #{@brutal_halt_command}"
+        `#{@brutal_halt_command}`
+        sleep @settings[:checkinterval]
         self.external_kill
       end
     end
 
     def external_kill
-      Process.kill("KILL", @pid) if @pid
+      if self.is_running?
+        @log.debug "Killing pid: #{@pid}"
+        Process.kill("KILL", @pid) if @pid
+      end
     end
 
     def interpolate_cmd(cmd)

data/lib/erlnixify/opts.rb

@@ -8,37 +8,130 @@ module Erlnixify
   #
   class Opts
 
-    attr_reader :options, :opts
+    attr_reader :options, :opts, :command
 
     def initialize(args)
+      cmd = :start
       @opts = Slop.parse(args) do
 
         banner = "Usage: erlnixify [options]"
 
-        on :b, :release=, 'Release Root Directory'
-        on :e, :erlang=, 'Erlang Root Directory'
-        on :o, :home=, "The home directory to explicitly set"
-        on :n, :name=, "The short name of the node to be managed"
-        on :fullnode=, "The fully qualified node name"
-        on :m, :command=, "The command to run to start the release"
-        on :k, :check=, "The command to check if the release is active"
-        on :r, :checkregex=, "The regex that must match to the output of check command"
-        on :x, :cookiefile=, "A file that contains the erlang cookie, not needed if cookie is set"
-        on :i, :cookie=, "The cookie itself, not needed if cookie-file is set"
-        on(:t, :startuptimeout=,
-            "The amount of time to let the system startup in seconds",
-            as: Integer)
-        on(:a, :checkinterval=,
-            "How often erlnixify should check to see if the system is still running",
-            as: Integer)
-        on(:w, :checktimeout=,
-           "The longest time a check can run, defaults to 30 seconds",
-           as: Integer)
-        on :c, :config=, "A file that contains the YAML based config for this system"
-        on :v, :version, "Show the Version"
+        command 'startdeamon' do
+          on :b, :release=, 'Release Root Directory'
+          on :e, :erlang=, 'Erlang Root Directory'
+          on :o, :home=, "The home directory to explicitly set"
+          on :n, :name=, "The short name of the node to be managed"
+          on :fullnode=, "The fully qualified node name"
+          on :m, :command=, "The command to run to start the release"
+          on :k, :check=, "The command to check if the release is active"
+          on :r, :checkregex=, "The regex that must match to the output of check command"
+          on :x, :cookiefile=, "A file that contains the erlang cookie, not needed if cookie is set"
+          on :i, :cookie=, "The cookie itself, not needed if cookie-file is set"
+          on(:t, :startuptimeout=,
+             "The amount of time to let the system startup in seconds",
+             as: Integer)
+          on(:a, :checkinterval=,
+             "How often erlnixify should check to see if the system is still running",
+             as: Integer)
+          on(:w, :checktimeout=,
+             "The longest time a check can run, defaults to 30 seconds",
+             as: Integer)
+          on :c, :config=, "A file that contains the YAML based config for this system"
+          on :v, :version, "Show the Version"
+
+          run do |opts, args|
+            cmd = :startdeamon
+          end
+        end
+
+        command 'start' do
+          on :b, :release=, 'Release Root Directory'
+          on :e, :erlang=, 'Erlang Root Directory'
+          on :o, :home=, "The home directory to explicitly set"
+          on :n, :name=, "The short name of the node to be managed"
+          on :fullnode=, "The fully qualified node name"
+          on :m, :command=, "The command to run to start the release"
+          on :k, :check=, "The command to check if the release is active"
+          on :r, :checkregex=, "The regex that must match to the output of check command"
+          on :x, :cookiefile=, "A file that contains the erlang cookie, not needed if cookie is set"
+          on :i, :cookie=, "The cookie itself, not needed if cookie-file is set"
+          on(:t, :startuptimeout=,
+             "The amount of time to let the system startup in seconds",
+             as: Integer)
+          on(:a, :checkinterval=,
+             "How often erlnixify should check to see if the system is still running",
+             as: Integer)
+          on(:w, :checktimeout=,
+             "The longest time a check can run, defaults to 30 seconds",
+             as: Integer)
+          on :c, :config=, "A file that contains the YAML based config for this system"
+          on :v, :version, "Show the Version"
+
+          run do |opts, args|
+            cmd = :start
+          end
+        end
+
+        command 'stop' do
+          on :b, :release=, 'Release Root Directory'
+          on :e, :erlang=, 'Erlang Root Directory'
+          on :o, :home=, "The home directory to explicitly set"
+          on :n, :name=, "The short name of the node to be managed"
+          on :fullnode=, "The fully qualified node name"
+          on :m, :command=, "The command to run to start the release"
+          on :k, :check=, "The command to check if the release is active"
+          on :r, :checkregex=, "The regex that must match to the output of check command"
+          on :x, :cookiefile=, "A file that contains the erlang cookie, not needed if cookie is set"
+          on :i, :cookie=, "The cookie itself, not needed if cookie-file is set"
+          on(:t, :startuptimeout=,
+             "The amount of time to let the system startup in seconds",
+             as: Integer)
+          on(:a, :checkinterval=,
+             "How often erlnixify should check to see if the system is still running",
+             as: Integer)
+          on(:w, :checktimeout=,
+             "The longest time a check can run, defaults to 30 seconds",
+             as: Integer)
+          on :c, :config=, "A file that contains the YAML based config for this system"
+          on :v, :version, "Show the Version"
+
+          run do |opts, args|
+            cmd = :stop
+          end
+        end
+
+        command 'status' do
+          on :b, :release=, 'Release Root Directory'
+          on :e, :erlang=, 'Erlang Root Directory'
+          on :o, :home=, "The home directory to explicitly set"
+          on :n, :name=, "The short name of the node to be managed"
+          on :fullnode=, "The fully qualified node name"
+          on :m, :command=, "The command to run to start the release"
+          on :k, :check=, "The command to check if the release is active"
+          on :r, :checkregex=, "The regex that must match to the output of check command"
+          on :x, :cookiefile=, "A file that contains the erlang cookie, not needed if cookie is set"
+          on :i, :cookie=, "The cookie itself, not needed if cookie-file is set"
+          on(:t, :startuptimeout=,
+             "The amount of time to let the system startup in seconds",
+             as: Integer)
+          on(:a, :checkinterval=,
+             "How often erlnixify should check to see if the system is still running",
+             as: Integer)
+          on(:w, :checktimeout=,
+             "The longest time a check can run, defaults to 30 seconds",
+             as: Integer)
+          on :c, :config=, "A file that contains the YAML based config for this system"
+          on :v, :version, "Show the Version"
+
+          run do |opts, args|
+            cmd = :status
+          end
+        end
+
       end
 
-      @options = opts.to_hash
+      @options = opts.to_hash(true)
+      @command = cmd
     end
   end
 

data/lib/erlnixify/settings.rb

@@ -14,14 +14,13 @@ module Erlnixify
     CHECK_COMMAND = "erlang statistics [reductions]"
     CHECK_REGEX = "^{\\d+, \\d+}$"
 
-    def initialize(opts)
-      @options = opts
-      config = @options.options[:config]
+    def initialize(options)
+      config = options[:config]
 
       @settings = self.default_settings
 
       self.load! config if config
-      self.merge(@options.options)
+      self.merge(options)
       self.post_settings_setup
     end
 

data/lib/erlnixify/version.rb

@@ -1,3 +1,3 @@
 module Erlnixify
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/erlnixify.rb

@@ -9,34 +9,52 @@ module Erlnixify
   class Main
     def self.main(args)
       @opts = Erlnixify::Opts.new(args)
-
-      if @opts.opts.version?
+      options = nil
+      options = @opts.options[@opts.command]
+      if options[:version]
         puts Erlnixify::VERSION
         exit 0
       end
 
-      if not @opts.opts.command?
+      if not options[:command]
         puts "missing command option, this is required"
         puts @opts.opts.help
         exit 1
       end
 
-      if not @opts.opts.name?
+      if not options[:name]
         puts "missing name option"
         puts @opts.opts.help
         exit 1
       end
 
-      if not (@opts.opts.cookie? || @opts.opts.cookiefile?)
+      if not (options[:cookie] || options[:cookiefile])
         puts "missing both cookie and cookiefile options, at least one is required"
         puts @opts.opts.help
         exit 1
       end
 
-      @settings = Erlnixify::Settings.new(@opts)
-      @process = Erlnixify::Node.new(@settings)
+      @settings = Erlnixify::Settings.new(options)
+      @node = Erlnixify::Node.new(@settings)
       begin
-        @process.start
+        case @opts.command
+        when :start
+          @node.start
+        when :startdeamon
+          @node.start_deamon
+          exit 0
+        when :stop
+          @node.stop
+        when :status
+          begin
+            @node.status
+          rescue Exception => msg
+            puts "stopped", msg
+            exit 127
+          end
+        else
+          @node.start
+        end
       rescue Erlnixify::NodeError
         exit 127
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erlnixify
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Eric Merritt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler