servicemonitor 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 137ee194873265b6f9c6a365cee21be149c047fa
-  data.tar.gz: 5eedb94c6c42494727f598e8e8f6a1e516ea9e53
+  metadata.gz: 338a78861e00b178aa687aff2a6e83cf1d6825c4
+  data.tar.gz: 87a7362a0efc9a52245f69571173b3ebbf26f531
 SHA512:
-  metadata.gz: 95bbcc2319573054ee264b2e889ee72e034fe9cda998b390f36edcd01b6c731e58e9efc3696d7f87c222e87649d225387bf1cac7c26b64595a833e2d64ee5115
-  data.tar.gz: 88c763fa21d47351a87f7116da78c3167fc4b7fe9cec764071dc19d2bc0f0f2f02a0422cd69d84755e59bd9f972b4fd28fb41766cd5399cdbaea903604544713
+  metadata.gz: d4532c3f8b364c265adfc52d3cb6a1d7daa9b23212df762f52b214bb446684b30d3d0fccabc04cddc12ae20f92584a54e4672bdbb8fa7fc00386a9c9739f5ca1
+  data.tar.gz: ec530dc907339abadc8565a5f8743c22a6f3cd785e550caacc67bf1b2796f101535096b28e9ebaab8ef0af57244316a16498370d6e89c34756dbd2af8d64dc6e

data/bin/servicemonitor

@@ -4,16 +4,16 @@
 $:.unshift './'
 
 require 'net/smtp'
-require 'Alert'
-require 'Alert/Email'
-require 'MonitorType'
-require 'MonitorType/Threshold'
-require 'MonitorType/Beanstalk'
-require 'MonitorType/Dir'
-require 'MonitorType/FluidDb'
-require 'MonitorType/Process'
-require 'MonitorType/HttpGetJsonList'
-require 'MonitorManager'
+require 'alert'
+require 'alert/email'
+require 'monitor_type'
+require 'monitor_type/threshold'
+require 'monitor_type/beanstalk'
+require 'monitor_type/dir'
+require 'monitor_type/fluidDb'
+require 'monitor_type/process'
+require 'monitor_type/http_get_json_list'
+require 'monitor_manager'
 require 'helper_functions'
 
 # Don't buffer stdout
@@ -38,8 +38,9 @@ rescue ArgumentError
        "***   <command>, [:arg=>value]\n"
 rescue SystemExit
 #    rescue SIGTERM=>e
-rescue StandardError
+rescue StandardError => e
   puts 'What the ...'
   puts e.class.name
   puts e.message
+  puts e.backtrace
 end

data/lib/alert/email.rb

@@ -1,5 +1,5 @@
 require 'net/smtp'
-require 'Alert'
+require 'alert'
 
 # Email alert class
 # Uses localhost for sending email - Probably need to change this in the future.

data/lib/monitor_manager.rb

@@ -25,11 +25,10 @@ class MonitorManager
     string = "Exiting on request ...\n"
     puts string
 
-  rescue StandardError
-    string = "#{e.class.name}\n" \
-             "*** This is really unexpected.\n" \
-             "Message: #{e.message}\n" \
-             "#{e.backtrace}\n"
-    puts string
+  rescue StandardError => e
+    puts '*** This is really unexpected.'
+    puts e.class.name
+    puts "Message: #{e.message}"
+    puts e.backtrace
   end
 end

data/lib/monitor_type.rb

@@ -105,7 +105,7 @@ class MonitorType
     body = "#{@name} tripped.\n#{string}"
     puts '*** '
     if !@email.nil?
-      AlertEmail.new(@sender_email, @email, body).Send
+      AlertEmail.new(@sender_email, @email, body).send
       puts "Emailed, #{@email}"
     else
       puts body

data/lib/monitor_type/fluiddb.rb

@@ -1,4 +1,4 @@
-require 'FluidDb'
+require 'fluiddb2'
 require 'monitor_type/threshold'
 
 # A database class for checking a single number against a threshold.
@@ -40,7 +40,7 @@ class MonitorTypeFluidDb < MonitorTypeThreshold
   # This ensures that all params are correct.
   def setup
     begin
-      @fluid_db = FluidDb.Db(@uri)
+      @fluid_db = FluidDb2.db(@uri)
     rescue StandardError => e
       string = "*** FluidDb encountered an error while connecting to the db\n" \
                "*** Error: #{e.message}\n" \
@@ -53,7 +53,7 @@ class MonitorTypeFluidDb < MonitorTypeThreshold
   end
 
   def derived_value
-    @fluid_db.queryForValue(@sql, [])
+    @fluid_db.query_for_value(@sql, [])
   rescue StandardError
     string = "*** FluidDb encountered an error while running the sql\n" \
              "*** sql: #{@sql}\n" \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servicemonitor
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Guy Irvine