arvicco-avalon 0.0.10 → 0.0.11

data/README.md

@@ -33,7 +33,7 @@ Sample monitor config file for production environment below. Modify it, add your
     ------- ~/.avalon/monitor.yml --------
     # Prod configuration (default)
     prod:
-      :status_fails_to_alarm: 2
+      :alert_after: 2  # missed pings or status reports from a miner
       :bitcoind:
         :ip: 192.168.1.13
         :rpcuser: jbond

data/lib/avalon/config.rb

@@ -6,7 +6,7 @@ module Avalon
     def self.load env
       config_file = find_file( '../../../config/monitor.yml', '~/.avalon/monitor.yml')
 
-      raise "No config file: #{config_file}" unless File.exist? config_file
+      raise "No config file: ~/.avalon/monitor.yml" unless File.exist? config_file
 
       @config = YAML::load_file(config_file)[env]
       @config[:environment] = env

data/lib/avalon/extractable.rb

@@ -1,8 +1,6 @@
 module Avalon
 
   # Mix-in for extraction of properties from a given input String or Hash
-  # Depeds on #fields method hook in the host class to enumerate property fields,
-  # in the format: {:name => [width, pattern, type/conversion]}
   module Extractable
 
     # type = :absolute_time | :absolute_date | :relative_time
@@ -49,4 +47,4 @@ module Avalon
     end
 
   end
-end
+end

data/lib/avalon/miner.rb

@@ -15,11 +15,10 @@ module Avalon
     FIELDS = {
       :ping => [8, /./, nil],  # not in miner status string...
       :mhs => [6, /(?<=MHS av=)[\d\.]*/, :i],
-      # :uptime => [6, /(?<=Elapsed=)[\d\.]*/, ->(x){ (x.to_i/60.0/60.0).round(2)}],
       :uptime => [8, /(?<=Elapsed=)[\d\.]*/, ->(x){ my_time(x, :relative_time)}],
       :last => [8, /(?<=Last Share Time=)[\d\.]*/,
                 ->(x){ my_time(Time.now.getgm-x.to_i, :relative_time)}],
-      # ->(x){ my_time(Time.now-Time.at(x.to_i), :relative_time)}],
+      :temp => [5, /(?<=Temperature=)[\d\.]*/, :f],
       :utility => [7, /(?<=,Utility=)[\d\.]*/, :f],
       :getworks => [8, /(?<=Getworks=)[\d\.]*/, :i],
       :accepted => [8, /(?<=,Accepted=)[\d\.]*/, :i],
@@ -40,7 +39,8 @@ module Avalon
       @num = ip.split('.').last.to_i
       @min_speed = min_speed * 1000 # Gh/s to Mh/s
       @fails = 0
-      @status_fails_to_alarm = Avalon::Config[:status_fails_to_alarm] || 2
+      @alert_after = Avalon::Config[:alert_after] ||
+        Avalon::Config[:status_fails_to_alarm] || 2
       super()
     end
 
@@ -51,7 +51,12 @@ module Avalon
     def poll verbose=true
       self[:ping] = ping @ip
 
-      status = get_api('summary') + get_api('pools')
+      status = get_api('summary') + get_api('pools') + get_api('devs')
+      # pools = get_api('pools')
+      # devs = get_api('devs')
+      # p pools, pools[FIELDS[:last][1]]
+      # p devs
+
       data = self.class.extract_data_from(status)
 
       if data.empty?
@@ -72,7 +77,7 @@ module Avalon
     def report
       if data[:ping].nil?
         @fails += 1
-        if @fails >= @status_fails_to_alarm
+        if @fails >= @alert_after
           alarm "Miner #{@num} did not respond to status query"
         end
       else

data/lib/avalon/version.rb

@@ -1,3 +1,3 @@
 module Avalon
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvicco-avalon
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday