alerty 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dc780dc6ff3b7cb73a5a2437a14c8d3b20dd6b9
-  data.tar.gz: 69c93803fae418ba85eb59209d7f72be131e7c0d
+  metadata.gz: 99625b0f092fb2052e60c8129488d491979362b1
+  data.tar.gz: 880411be5f61727839f2cfb6e72c5d5113fd4ffa
 SHA512:
-  metadata.gz: 024cebed5e8cdb6e2ba635b4843ad7eccd8aef3b7ae236d59a73fc23feb022fe90c1a97d74164ba7f96d7fd8631c0408d29ee2bbfaff1ba62ef1f3e20183db51
-  data.tar.gz: 001e13b2d87b2456fda46b973690fd1080c2ae676cc08f4e5d92db5f0a8b12cfe3948c3e5062d5fa0b6893855c2d9aafd25699cae56447db44b3036f3a150a7f
+  metadata.gz: 9233e87fdfc4cb57d2421749a2b5596d9d6e06c20518ecef6fac7d5a902ccd1d65ad3066c74d7e5787ca729ec5023c86c98d732536f35e5becfde49ffe37583e
+  data.tar.gz: d55ebdb2a4aa61cb5cad01599789acbdea3f3ec219efb2de4be783b853ada5bb61e9375f19ca099c59295cb8d0f520ea451b14624bb9b4e14a18d6f0d5792e41

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.0.8 (2015/08/15)
+
+Enhancements:
+
+* Send alert if timeout or locked occurs
+
 # 0.0.7 (2015/08/15)
 
 Enhancements:

data/README.md

@@ -44,8 +44,8 @@ $ bin/alerty -h
     -c, --config CONFIG_FILE         config file path (default: /etc/alerty/alerty.yml)
         --log LOG_FILE               log file path (default: STDOUT)
     -l, --log-level LOG_LEVEL        log level (default: warn)
-    -t, --timeout SECONDS            timeout the command (default: no timeout)
-        --lock LOCK_FILE             exclusive lock file to prevent running a command duplicatedly (default: no lock)
+    -t, --timeout SECONDS            timeout of the command, send alert if timeout reached (default: no timeout)
+        --lock LOCK_FILE             exclusive lock file to prevent running a command duplicatedly, send alert if locked (default: no lock)
     -d, --debug                      debug mode (same with --log-level debug)
 ```
 

data/alerty.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "alerty"
-  gem.version       = '0.0.7'
+  gem.version       = '0.0.8'
   gem.author        = ['Naotoshi Seo']
   gem.email         = ['sonots@gmail.com']
   gem.homepage      = 'https://github.com/sonots/alerty'
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'hashie'
   gem.add_runtime_dependency 'oneline_log_formatter'
-  gem.add_runtime_dependency 'frontkick'
+  gem.add_runtime_dependency 'frontkick', '>= 0.4.0'
 
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'pry'

data/lib/alerty/command.rb

@@ -12,17 +12,38 @@ class Alerty
 
     def run!
       started_at = Time.now
-      result = Frontkick.exec("#{@command} 2>&1", @opts)
-      record = {
-        hostname:   @hostname,
-        command:    @command,
-        exitstatus: result.exitstatus,
-        output:     result.stdout,
-        started_at: started_at.to_f,
-        duration:   result.duration,
-      }
+      begin
+        result = Frontkick.exec("#{@command} 2>&1", @opts)
+      rescue Frontkick::Timeout => e
+        record = {
+          hostname:   @hostname,
+          command:    @command,
+          exitstatus: 1,
+          output:     "`#{@command}` is timeout (#{@opts[:timeout]} sec)",
+          started_at: started_at.to_f,
+          duration:   @opts[:timeout],
+        }
+      rescue Frontkick::Locked => e
+        record = {
+          hostname:   @hostname,
+          command:    @command,
+          exitstatus: 1,
+          output:     "`#{@opts[:exclusive]}` is locked by another process",
+          started_at: started_at.to_f,
+          duration:   0,
+        }
+      else
+        record = {
+          hostname:   @hostname,
+          command:    @command,
+          exitstatus: result.exitstatus,
+          output:     result.stdout,
+          started_at: started_at.to_f,
+          duration:   result.duration,
+        }
+      end
       Alerty.logger.info { "result: #{record.to_json}" }
-      if result.success?
+      if record[:exitstatus] == 0
         exit 0
       else
         Config.plugins.each do |plugin|
@@ -32,7 +53,7 @@ class Alerty
             Alerty.logger.warn "#{e.class} #{e.message} #{e.backtrace.join("\n")}"
           end
         end
-        exit result.exitstatus
+        exit record[:exitstatus]
       end
     end
   end

data/spec/command_spec.rb

@@ -49,5 +49,60 @@ describe Alerty::Command do
         expect(JSON.parse(stdout)["output"]).to eql("foo")
       end
     end
+
+    context 'timeout' do
+      before do
+        Alerty::Config.instance_variable_set(:@config, Hashie::Mash.new(
+          plugins: [{
+            type: 'stdout',
+          }]
+        ))
+        Alerty::Config.configure(
+          log_path: '/tmp/foo',
+          log_level: 'fatal',
+          timeout: 0.1,
+          lock_path: '/tmp/lock',
+        )
+      end
+
+      let(:command) { Alerty::Command.new(command: 'sleep 1') }
+
+      it do
+        expect(Frontkick).to receive(:exec).with("sleep 1 2>&1", {
+          timeout: 0.1,
+          exclusive: '/tmp/lock',
+        }).and_raise(Frontkick::Timeout.new(111, 'sleep 1 2>&1', true))
+        stdout = capture_stdout { expect { command.run! }.to raise_error(SystemExit) }
+        expect(JSON.parse(stdout)["output"]).to include("timeout")
+      end
+    end
+
+    context 'lock' do
+      before do
+        Alerty::Config.instance_variable_set(:@config, Hashie::Mash.new(
+          plugins: [{
+            type: 'stdout',
+          }]
+        ))
+        Alerty::Config.configure(
+          log_path: '/tmp/foo',
+          log_level: 'fatal',
+          timeout: 20,
+          lock_path: '/tmp/lock',
+        )
+      end
+
+      let(:command) { Alerty::Command.new(command: 'sleep 1') }
+
+      it do
+        expect(Frontkick).to receive(:exec).with("sleep 1 2>&1", {
+          timeout: 20,
+          exclusive: '/tmp/lock',
+        }).and_raise(Frontkick::Locked)
+        stdout = capture_stdout { expect { command.run! }.to raise_error(SystemExit) }
+        expect(JSON.parse(stdout)["output"]).to include("lock")
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alerty
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Naotoshi Seo
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement