arvicco-avalon 0.0.16 → 0.0.17

data/README.md

@@ -39,9 +39,14 @@ Monitor script is periodically polling the mining units and other types of objec
     ------- ~/.avalon/monitor.yml --------
     # Prod configuration (default)
     prod:
-      :alert_sound: :aiff  # :none for silent alerts
       :alert_after: 2      # missed pings or status reports from a miner
       :alert_temp:  52     # degrees C and above
+      :alert_sounds:
+        :failure:       Glass.aiff                        # [] for no sound
+        :restart:       Frog.aiff                         # [] for no sound
+        :temp_high:     Ping.aiff                         # [] for no sound
+        :block_found:   [Dog.aiff, Purr.aiff, Dog.aiff]   # [] for no sound
+        :block_updated: [Purr.aiff, Purr.aiff, Purr.aiff] # [] for no alert sound
       :bitcoind:
         :ip: 192.168.1.13
         :rpcuser: jbond

data/lib/avalon/eloipool.rb

@@ -27,10 +27,10 @@ module Avalon
         alarm "Eloipool at #{@ip} not responding to ping"
       elsif self[:found] > @blocks.size
         add_new_blocks `ssh #{@ip} "cat solo/logs/pool.log | grep BLKHASH"`
-        alarm "Eloipool found #{@found} blocks", "Dog.aiff", "Purr.aiff", "Dog.aiff"
+        alarm "Eloipool found #{@found} blocks", :block_found
       elsif @blocks[@blocks.keys.last].pending?
         update_block @blocks[@blocks.keys.last] do
-          alarm "Eloipool last block updated", "Purr.aiff", "Purr.aiff", "Purr.aiff"
+          alarm "Eloipool last block updated", :block_updated
         end
       end
     end

data/lib/avalon/miner.rb

@@ -96,9 +96,9 @@ module Avalon
         if self[:mhs] < @min_speed and upminutes > 5
           alarm "Miner #{num} performance is #{self[:mhs]}, should be #{@min_speed}"
         elsif self[:temp] >= @alert_temp
-          alarm "Miner #{num} too hot at #{self[:temp]}C, needs cooling", "Ping.aiff"
+          alarm "Miner #{num} too hot at #{self[:temp]}C, needs cooling", :temp_high
         elsif upminutes < 2
-          alarm "Miner #{num} restarted", "Frog.aiff"
+          alarm "Miner #{num} restarted", :restart
         end
       end
     end

data/lib/avalon/utils.rb

@@ -10,8 +10,10 @@ module Avalon
     end
 
     # Helper method: play a sound file
-    def play tune
-      unless Avalon::Config[:alert_sound] == :none
+    def play what
+      tunes = [Avalon::Config[:alert_sounds][what] || what].compact.flatten
+
+      tunes.each do |tune|
         file = find_file( tune, "../../../sound/#{tune}",
                           "~/.avalon/sound/#{tune}", "/System/Library/Sounds/#{tune}")
         case system
@@ -25,12 +27,9 @@ module Avalon
     end
 
     # Helper method: sound alarm with message
-    def alarm message, *tunes
+    def alarm message, sound=:failure
       puts message
-
-      tunes.push('Glass.aiff') if tunes.empty?
-
-      tunes.each {|tune| play tune }
+      play sound
     end
 
     # Helper method: ping the Node, return ping time in ms

data/lib/avalon/version.rb

@@ -1,3 +1,3 @@
 module Avalon
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvicco-avalon
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors: