brigade-monitor 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3fb94fa396f710eec90358473fc93714f18b9f2
-  data.tar.gz: df8751ddc28316fd2329d457ce68b575f245c3d3
+  metadata.gz: 0f4f620255dcb2564130a447d620fa4a87ed24db
+  data.tar.gz: 77758c22724815b610be70234fcff7e471bdce34
 SHA512:
-  metadata.gz: 36a5992c5b13450b7e0f0c1c5d84e023b589ffdaab69bb88ab6fb2589171af7188d9dcda764082cd28952795d782680f2a90e5211e2f940156e9d966bb4581dd
-  data.tar.gz: fff8601a70766f3e8b8e49023025814c16e9aa1f328f2230c55f82590dd5e7bd93ca985daddcbc211eeed19ca30375b217fad2bfc477df295a186ebfeedb98fe
+  metadata.gz: b276d063318d5b298d90d395d478ce3de9f4996f68f09a0af893ff01bc7d415f4eef6fbf37a03c7bddb0517db3069b43e6335f29001d0a7302b85f9d2cbf4a05
+  data.tar.gz: f9cdaabf396ad617885e1c6593492cb69d2d94fca49ff6acc71fd0e598d2a846e9cc042e0a91acad36672e7f87217351b8af6531833f178dc7e21a3ea44c3a3b

data/bin/brigade-monitor

@@ -3,11 +3,15 @@
 require 'awesome_print'
 require 'brigade/monitor'
 require 'cgminer/api'
+require 'logger'
 require 'optparse'
 require 'yaml'
 
 me = File.basename(__FILE__)
 
+log = Logger.new(STDOUT)
+log.level = Logger::WARN
+
 options = {}
 optparse = OptionParser.new do |opts|
   opts.banner = "Usage: #{me} [options]"
@@ -17,6 +21,14 @@ optparse = OptionParser.new do |opts|
   opts.on('-k', '--key API-KEY', String, 'Brigade API key') do |key|
     options[:key] = key
   end
+  opts.on('-d', '--debug LEVEL', [:debug, :info], 'Debug level (DEBUG, INFO)') do |dbg|
+    case dbg
+    when :debug
+      log.level = Logger::DEBUG
+    when :info
+      log.level = Logger::INFO
+    end
+  end
   opts.on('-v', '--version', 'Print application version') do
     puts "#{me} v#{Brigade::Monitor::VERSION}"
     exit
@@ -34,81 +46,11 @@ end
 key = options.fetch(:key, config['api-key'])
 fail 'Brigade API key is required' if key.nil?
 
-# XXX connect once, check API key validity
-
 # build a hash-o-miner clients
 miners = config['miners'].map do |miner|
-  {
-    name: miner[0],
-    client: CGMiner::API::Client.new(miner[1]['host'], miner[1]['port'])
-  }
+  client = CGMiner::API::Client.new(miner[1]['host'], miner[1]['port'])
+  { name: miner[0], client: client }
 end
 
-api = Brigade::Monitor::API.new(key)
-loop do
-
-  updates = []
-
-  miners.each do |miner|
-    begin
-      summary = miner[:client].summary
-      devs = miner[:client].devs
-      pools = miner[:client].pools
-
-      # XXX check status replies on each command?
-
-      update = {
-        host: miner[:name],
-        uptime: summary.body[0]['Elapsed'],
-        mhash: summary.body[0]['MHS 5s'],
-        rejectpct: summary.body[0]['Pool Rejected%'],
-        asics: [],
-        fpgas: [],
-        gpus: [],
-        pools: []
-      }
-
-      devs.body.each do |dev|
-        if dev.has_key? 'GPU'
-          update[:gpus] << {
-            index: dev['GPU'],
-            temperature: dev['Temperature'],
-            enabled: dev['Enabled'] == 'Y',
-            status: :ok,                            # XXX enumerate statuses
-            uptime: dev['Device Elapsed'],
-            mhash: dev['MHS 5s'],
-            rejectpct: dev['Device Rejected%']
-          }
-        else
-          puts "Skipped device: #{dev}"
-        end
-      end
-
-      pools.body.each do |pool|
-        update[:pools] << {
-          index: pool['POOL'],
-          url: pool['URL'],
-          status: :ok,                              # XXX enumerate statuses
-          active: pool['Stratum Active'],
-          rejectpct: pool['Pool Rejected%']
-        }
-      end
-
-      updates << update
-    rescue Net::OpenTimeout
-      puts "Timed out: #{miner}"
-      # XXX put something in the update to indicate it barfed
-    rescue Exception => e
-      puts "Some other error: #{miner} (#{e.class})"
-      # XXX put something in the update to indicate it barfed
-    end
-  end
-
-  response = api.hosts(updates)
-  unless 200 == response.code
-    puts "XXX: response: #{response.code}"
-  end
-
-  sleep 60
-
-end
+mon = Brigade::Monitor::Monitor.new(key, miners, log)
+mon.run

data/lib/brigade/monitor.rb

@@ -1,2 +1,3 @@
 require 'brigade/monitor/api'
+require 'brigade/monitor/monitor'
 require 'brigade/monitor/version'

data/lib/brigade/monitor/api.rb

@@ -8,8 +8,9 @@ module Brigade
       include HTTParty
       base_uri 'https://app.brigade.io/api/v1'
 
-      def initialize(key)
+      def initialize(key, logger)
         @key = key
+        @log = logger
       end
 
       def hosts(data)
@@ -19,8 +20,8 @@ module Brigade
       private
 
       def command(command, params)
-        params.merge!({ token: @key })
-        self.class.post(command, query: params, verify: false)
+        @log.debug("Posting command: #{command}, params: #{params}")
+        self.class.post(command, query: params.merge({ token: @key }), verify: false)
       end
 
     end

data/lib/brigade/monitor/monitor.rb

@@ -0,0 +1,136 @@
+module Brigade
+  module Monitor
+
+    class Monitor
+
+      def initialize(key, miners, logger)
+        @key = key
+        @miners = miners
+        @log = logger
+      end
+
+      def run
+        api = Brigade::Monitor::API.new(@key, @log)
+
+        @log.info("Monitoring #{@miners.length} miners")
+        loop do
+          updates = []
+
+          @miners.each do |miner|
+            @log.debug("Beginning miner: #{miner}")
+
+            begin
+              updates << get_update(miner)
+            rescue Net::OpenTimeout => e
+              @log.warn("Net::OpenTimeout building update for #{miner[:name]} (#{e})")
+              # XXX put something in the update to indicate it barfed
+            rescue Exception => e
+              @log.error("Exception building update for #{miner[:name]} (#{e})")
+              # XXX put something in the update to indicate it barfed
+            end
+          end
+
+          if updates.empty?
+            @log.info("Updates empty, not submitting")
+          else
+            @log.info("Updates available (#{updates.length}), submitting")
+            begin
+              tries ||= 3
+              response = api.hosts(updates)
+            rescue Exception => e
+              @log.error("Exception submitting updates (#{e})")
+              unless (tries -= 1).zero?
+                @log.error('Retrying...')
+                retry
+              else
+                @log.error('Giving up for this update...')
+              end
+            else
+              if 401 == response.code
+                @log.error('Unauthorized response submitting updates, check API key!')
+                return
+              end
+              @log.info("Submitted updates (status: #{response.code})")
+            end
+          end
+
+          sleep 60
+
+        end
+      end
+
+      def get_update(miner)
+        summary = miner[:client].summary
+        devs = miner[:client].devs
+        pools = miner[:client].pools
+
+        # XXX check status replies on each command?
+
+        update = {
+          host: miner[:name],
+          uptime: summary.body[0]['Elapsed'],
+          mhash: summary.body[0]['MHS av'],
+          rejectpct: summary.body[0]['Pool Rejected%'],
+          asics: [],
+          fpgas: [],
+          gpus: [],
+          pools: []
+        }
+
+        devs.body.each do |dev|
+          if dev.has_key? 'GPU'
+            update[:gpus] << {
+              index: dev['GPU'],
+              temperature: dev['Temperature'],
+              enabled: dev['Enabled'] == 'Y',
+              status: :ok,                            # XXX enumerate statuses
+              uptime: dev['Device Elapsed'],
+              mhash: dev['MHS av'],
+              hwerrors: dev['Hardware Errors'],
+              rejectpct: dev['Device Rejected%']
+            }
+          elsif dev.has_key? 'ASC'
+            update[:asics] << {
+              index: dev['ASC'],
+              temperature: dev['Temperature'],
+              enabled: dev['Enabled'] == 'Y',
+              status: :ok,                            # XXX enumerate statuses
+              uptime: dev['Device Elapsed'],
+              mhash: dev['MHS av'],
+              hwerrors: dev['Hardware Errors'],
+              rejectpct: dev['Device Rejected%']
+            }
+          elsif dev.has_key? 'PGA'
+            update[:fpgas] << {
+              index: dev['PGA'],
+              temperature: dev['Temperature'],
+              enabled: dev['Enabled'] == 'Y',
+              status: :ok,                            # XXX enumerate statuses
+              uptime: dev['Device Elapsed'],
+              mhash: dev['MHS av'],
+              hwerrors: dev['Hardware Errors'],
+              rejectpct: dev['Device Rejected%']
+            }
+          else
+            @log.warn("Skipped unknown device: #{dev}")
+          end
+        end
+
+        pools.body.each do |pool|
+          update[:pools] << {
+            index: pool['POOL'],
+            url: pool['URL'],
+            status: :ok,                              # XXX enumerate statuses
+            active: pool['Stratum Active'],
+            rejectpct: pool['Pool Rejected%']
+          }
+        end
+
+        @log.debug("Built update: #{update}")
+        update
+      end
+
+    end
+
+  end
+end

data/lib/brigade/monitor/version.rb

@@ -1,5 +1,5 @@
 module Brigade
   module Monitor
-    VERSION = '0.0.6'
+    VERSION = '0.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brigade-monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Nick Veys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,6 +168,7 @@ files:
 - brigade-monitor.gemspec
 - lib/brigade/monitor.rb
 - lib/brigade/monitor/api.rb
+- lib/brigade/monitor/monitor.rb
 - lib/brigade/monitor/version.rb
 - sample-config.yaml
 - spec/spec_helper.rb