rnagios 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d218dc592c0635556cca6e6a8d01d86410271812
-  data.tar.gz: 574cce6c678b58ac64343d840b39f5b078fe759a
+  metadata.gz: ccc2b6228857341c8852cbd7fae32795c2456a96
+  data.tar.gz: 57cc3cbe0a9d47aefb9f12d614bd33db10c18d78
 SHA512:
-  metadata.gz: 6ffc116c769c597c7575285eaf65bbe0223f1b38625d97ff48557621019155652c6359260bd15e8298a756a13e3f2d53b5fcc8dc4a83017cc512a8e62a61bdf8
-  data.tar.gz: 83427ebbbebd7db2ce4054764660707f614a685aa847022dfc4406992e57bb79351967cf57fa7daa5c7f3669314e36e0ede5d83918ee9a0aa60269fe319ef63d
+  metadata.gz: cbbcd31d3f14a7fe2391b48c82519af9ade376dac30693b3b6dd5d9519dc5d50297c9cfd98a818069ce72acf0c75033aabdaf93e8deadb7caaddef892976e0c1
+  data.tar.gz: 93747faba10d44d4ff00c25024e1b687bbee621568dca3ad4c245a13f8ef0948450a2125247d27b97cd7b1849efbac490b71978a49b9b277884f5606a424323c

data/README.md

@@ -33,3 +33,5 @@ be parsed in the check method before the measure method is called.
 measure() can then use the @config attribute to access configuration
 parameters.  The configuration file is expected to be in the same
 directory as the plugin.
+
+[How to use RNagios](https://github.com/Snapman/rnagios/wiki/RNagios)

data/lib/rnagios/plugin.rb

@@ -146,7 +146,11 @@ class Plugin
 
     # If there is a config file, load it
     if !blank? @config_file
-      @config = YAML.load_file(@config_file)
+      begin
+        @config = YAML.load_file(@config_file)
+      rescue Psych::SyntaxError => e
+        raise NagiosError.new('Error occurred while trying to parse YAML config file; please verify that config file is valid YAML')
+      end
     end
 
     # measure() is where the magic happens.  measure() should
@@ -271,16 +275,13 @@ private
     # NSCA check results are different from active check results
     # [<timestamp>] PROCESS_SERVICE_CHECK_RESULT;<host_name>;<svc_description>;<return_code>;<plugin_output>
     def format_passive_service_check(status)
-      #'[' + Time.now.to_i.to_s + '] PROCESS_SERVICE_CHECK_RESULT;' + @host + ';' + @name + ';' + status.passive_code.to_s + ';' + status.message
-      #"[#{Time.now.to_i}] PROCESS_SERVICE_CHECK_RESULT;#{@host};#{@name};#{status.passive_code};#{status.message}"
       "#{@host}\t#{@name}\t#{status.passive_code}\t#{status.message}"
     end
 
     # NSCA check results are different from active check results
     # [<timestamp>] PROCESS_HOST_CHECK_RESULT;<host_name>;<host_status>;<plugin_output>
     def format_passive_host_check(status)
-      #'[' + Time.now.to_i.to_s + '] PROCESS_HOST_CHECK_RESULT;' + @host + ';' + status.passive_code.to_s + ';' + status.message
-      "#{@host}\t#{status.passive_code.to_s}\t#{status.message}"
+      "#{@host}\t#{status.passive_code}\t#{status.message}"
     end
 
     def valid?(status)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rnagios
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Roger A. Rubio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies: []
 description: Make your own plugins in Ruby for Nagios to run on the Nagios server
   or as NSCA plugins on remote servers.