srv_manager 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 437563702512cd5232a464dd34613f2d9666f569
-  data.tar.gz: 210427676d2042a5c78fab487b637795ae4889c0
+  metadata.gz: af39a453d9439c68cf905d5e9c1ffb551cab220f
+  data.tar.gz: 5d0dd7ead6bc0679f1b55838f3f0d0fd1fc9a5bc
 SHA512:
-  metadata.gz: efa6121b4e8303d7b1743d20e10ce8da11b47d2cd71b8c3dd78e27072f94f2d3d6b87ebcfade6e37aca4ddfa47a8e7e0fc34c1992453de5b8d8f970a3f391ee2
-  data.tar.gz: f128851de90230289a08d436bc88507f63c1886c50cb31d4cf49d21bdd99451d4c91763c9530c4ac654aebba477bf07ea173b54cbd787da35707e5dd11f0f9a5
+  metadata.gz: a302f485c2b8f98c6961d89d1e1014918e55aa080902425ebff9f1efcc42e3d807ab18b64f3ff9d423ae63e8aecf50f25c77c300af79b72ed99b577de867120d
+  data.tar.gz: 2ae906f457c4169808aa65b981dc8cf9fd30f6b13b4ac839ccfca48058aa4ed70e08ed4e0d16d517d030ec4e1a834831ebc956b8019efcb0b43326f8cebbce84

data/bin/srv

@@ -46,11 +46,12 @@ module SrvManager
       end
     end
 
+    option :kill, type: :boolean
     desc 'stop <NAME>', 'Stop service'
     def stop(name)
       Context.scoped(safe: true) do |ctx|
         service = find_service name, ctx
-        service.stop
+        options[:kill] ? service.kill : service.stop
       end
     end
 

data/lib/srv_manager/context.rb

@@ -41,13 +41,13 @@ module SrvManager
     private
 
     def self.load
-      LOGGER.info "Reading context from #{data_file}"
+      LOGGER.debug "Reading context from #{data_file}"
       return new unless File.exists? data_file
       Marshal.load(File.read(data_file))
     end
 
     def self.save(context)
-      LOGGER.info "Saving context to #{data_file}"
+      LOGGER.debug "Saving context to #{data_file}"
       FileUtils.mkpath File.dirname(data_file) unless Dir.exists? File.dirname(data_file)
       File.write data_file, Marshal.dump(context)
     end

data/lib/srv_manager/process.rb

@@ -16,15 +16,17 @@ module SrvManager
     end
 
     def stop
-      return unless started?
-      begin
-        ::Process.kill 'TERM', @id
-      rescue Errno::ESRCH
-      end
+      send_signal 'TERM'
       LOGGER.info "Stoped process #{@id}"
       @id = nil
     end
 
+    def kill
+      send_signal 'KILL'
+      LOGGER.info "Killed process #{@id}"
+      @id = nil
+    end
+
     def restart
       stop if alive?
       start
@@ -62,6 +64,14 @@ module SrvManager
       @id = wait_for_pid pid_file, true
     end
 
+    def send_signal(signal)
+      return unless alive?
+      begin
+        ::Process.kill signal, @id
+      rescue Errno::ESRCH
+      end
+    end
+
     def wait_for_pid(filename, delete=false)
       Timeout.timeout(60) do
         loop do

data/lib/srv_manager/service.rb

@@ -28,6 +28,11 @@ module SrvManager
       LOGGER.info "Stoped service #{name}"
     end
 
+    def kill
+      processes.each(&:kill)
+      LOGGER.info "Killed service #{name}"
+    end
+
     def restart
       processes.each(&:restart)
     end

data/lib/srv_manager/version.rb

@@ -1,3 +1,3 @@
 module SrvManager
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: srv_manager
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Service admin and monitor