check_from_file 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 901a66f425cf19a6cef69a5c840af0aa9807dee4
-  data.tar.gz: f6bfd14981015a516b098d126808a9d7ebe7b4cd
+  metadata.gz: 09dbdfbe57149fc6367bf4a9527c3414c948ffb7
+  data.tar.gz: 178e811e63710c613cd6f51515f1ab167f98e69b
 SHA512:
-  metadata.gz: ab967cd5745ccaee048213d96f55d9a76198dc70ce7eb4e7a7f214823c05eeb034a553726798b829ec52dfdc977aedad84376af00326ca4cd5e962c946b3c970
-  data.tar.gz: 4c3a84eb78718991b9d7414da073b24f130aa6bff3de2ecb74ff43424e2908a876d80bfac681f27e05b55d526fd4938e31b7b770efe9135df94d908c75a7f74d
+  metadata.gz: 904cf4904dcc3f90df440ae70691b0c2d8eecf4a700f078e4bf7b4ef5bc935121e4390e9d1f29a2aa64b2265b00271768ad29672016bd26e8808c55e98f9695c
+  data.tar.gz: 421c7cf788e96bb5524da1f2d5863476097da35e9ebb344eff7f839da9bdea38ba6ce9f88e0d3168356c707cdb14bd7b07fc3c3b7f9962aa88a1a31587e71a35

data/lib/check_from_file/check.rb

@@ -1,5 +1,6 @@
 require 'check_from_file'
 require 'nagiosplugin'
+require 'timeout'
 
 module CheckFromFile
   class Check < Nagios::Plugin
@@ -23,6 +24,41 @@ module CheckFromFile
     end
 
     def check
+      # Aquire lock before reading
+      if @options[:lock]
+        begin
+          File.open(@options[:lock], File::RDWR) do |lock|
+            Timeout::timeout(@options[:lock_timeout]) do
+              lock.flock(File::LOCK_EX) # Exclusive lock
+            end
+            read_files
+            lock.flock(File::LOCK_UN) # Unlock
+          end
+        rescue Timeout::Error
+          @lock_timeout = true
+        end
+      # Don't aquire lock before reading
+      else
+        read_files
+      end
+    end
+
+    def message
+      return "One or more output files are #{@age} seconds old!" if @stale
+      return "Timed out after #{options[:lock_timeout]} seconds while trying to "\
+        'get lock!' if @lock_timeout
+
+      ret = "Command: #{@options[:command]} returned "
+      if @critical
+        ret << "#{@return}, STDOUT: #{@stdout}, STDERR: #{@stderr}"
+      else
+        ret << "successfully"
+      end
+      return ret
+    end
+
+    private
+    def read_files
       [:return, :stdout, :stderr].each do |file|
         @age = (Time.now - File.stat(@options[file]).mtime).to_i
         case
@@ -39,17 +75,5 @@ module CheckFromFile
       @stdout = File.read(@options[:stdout])
       @stderr = File.read(@options[:stderr])
     end
-
-    def message
-      return "One or more output files are #{@age} seconds old!" if @stale
-
-      ret = "Command: #{@options[:command]} returned "
-      if @critical
-        ret << "#{@return}, STDOUT: #{@stdout}, STDERR: #{@stderr}"
-      else
-        ret << "successfully"
-      end
-      return ret
-    end
   end
 end

data/lib/check_from_file/cli.rb

@@ -8,9 +8,10 @@ module CheckFromFile
       options = OpenStruct.new
       options[:file_age_warning] = 150
       options[:file_age_critical] = 300
+      options[:lock_timeout] = 30
 
       opt_parser = OptionParser.new do |opts|
-        opts.banner = "Usage: #{$0} -c <command> -o <stdout> -e <stderr> -r <ret>"
+        opts.banner = "Usage: #{$0} -c <command> -o <stdout> -e <stderr> -r <ret> [-l <lock-file>]"
 
         opts.on('-c', '--command COMMAND', :REQUIRED, 'Command that was run to generate this output') do |command|
           options[:command] = command
@@ -36,6 +37,14 @@ module CheckFromFile
           options[:file_age_critical] = ret.to_i
         end
 
+        opts.on('-l', '--lock-file FILE', 'If passed, use file for exclusive lock before trying to read files') do |lock|
+          options[:lock] = lock
+        end
+
+        opts.on('-t', '--lock-timeout', 'Number of seconds to wait for lock acquisition') do |timeout|
+          options[:timeout] = timeout
+        end
+
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts
           exit

data/lib/check_from_file/version.rb

@@ -1,3 +1,3 @@
 module CheckFromFile
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: check_from_file
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Travis Thompson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler