txcatcher 0.1.88 → 0.1.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6814ca040f77d1ccdeb7762388fd1389cd3a14ae
-  data.tar.gz: ce49b9f0b3a1f67b9340d7e77e7f817e05c6d9c2
+  metadata.gz: 64f1365dc50e4121cc7d07fe99974bf9ac7f0c6a
+  data.tar.gz: 8c273474bb1badd095448d2b2940b55fa0736166
 SHA512:
-  metadata.gz: 91778cfcc2f9ac08e12feaa36f507a30e668e3f57d9aa7ec7da782555a82e134b7ddf4e4b2552a4ebc9b5b38c10b720bb3c8c993da274769e3dde55daaf58712
-  data.tar.gz: 5accdff4a0a2fcbaf5d98d93ca2da1143050e5199b1701eb557a5d713def3717e7d6028b1132d6c2dc0bfc212ae2611510462aad16765f4a1a8cd1ae7963dfed
+  metadata.gz: 82fb6d1ea5f063d7d7c9db04a9603bdd6ec61e8e4f712ec6f32146b353c38c607cec8cbaf76ec0a7153be8033c1a1e36737ff82b55c7e18aeab9ffa15186d397
+  data.tar.gz: 3dfb0e9e00e5ec5b8873f9d4394b124b5ed6b2f10935944f2412b5212cf9f0675bfe0d3dc87148221f997c35992593a7b98f4a3a142a12935f44872d348efb99

data/VERSION

@@ -1 +1 @@
-0.1.88
+0.1.89

data/bin/txcatcher-monitor

@@ -99,49 +99,60 @@ def latest_output_addr
 
 end
 
-def try_txcatcher(addr, sleep_time: 3)
-
-  url = TxCatcher::Config["monitor"]["txcatcher_url"] + "/addr/#{addr}/utxo"
-
+def fetch_txcatcher_response(addr, sleep_time: 3)
   response = {}
   3.times do
     sleep sleep_time # let's wait, perhaps txcatcher hasn't caught up
     response = fetch_txcatcher_for_addr(addr)
     break unless response.empty?
   end
-
-  if response.empty?
-    send_alert(
-      "TxCatcher response empty",
-      "TxCatcher returned an empty {} for #{url}"
-    )
-    TxCatcher::Logger.report("Checked #{url}, got empty response", :error)
-  else
-    TxCatcher::Logger.report("Checked #{url}, got #{response.size} utxos", :info)
-  end
-
+  return response
 end
 
 def fetch_txcatcher_for_addr(addr)
   response = Faraday.get do |req|
-    req.url TxCatcher::Config["monitor"]["txcatcher_url"] + "/addr/#{addr}/utxo"
+    req.url TxCatcher::Config["monitor"]["txcatcher_url"] + "/addr/#{addr}1/utxo"
     req.options.timeout = 5
     req.options.open_timeout = 5
   end
   JSON.parse(response.body)
 end
 
-begin
-  include TxCatcher::Initializer
-  ConfigFile.set!
-  TxCatcher::Logger.set_log_file_names!(log: "txcatcher_monitor.log", error: "txcatcher_monitor_errors.log")
-  read_config_file
-  try_txcatcher(latest_output_addr)
-rescue StandardError => e
-  TxCatcher::Logger.report(e, :error)
-  send_alert(
-    "TxCatcher monitor error",
-    "While checking #{TxCatcher::Config["monitor"]["txcatcher_url"]} response, got the following error\n\n" +
-    "#{e.to_s}\n\n#{e.backtrace.join("\n")}"
-  )
-end
+LOGGER = TxCatcher::Logger.new(log_file: "txcatcher_monitor.log", error_file: "txcatcher_monitor_errors.log", error_log_delimiter: "")
+include TxCatcher::Initializer
+ConfigFile.set!
+read_config_file
+
+response = nil
+attempts = 0
+while attempts < 3 && (response.nil? || response.empty?)
+  attempts += 1
+  begin
+
+    addr     = latest_output_addr
+    response = fetch_txcatcher_response(addr)
+    url      = TxCatcher::Config["monitor"]["txcatcher_url"] + "/addr/#{addr}/utxo"
+
+    if response.empty?
+      LOGGER.report("Checked #{url}, got empty response, attempt #{attempts}", :error)
+      if attempts >= 3
+        send_alert("TxCatcher response empty", "TxCatcher returned an empty {} for #{url}")
+      end
+    else
+      LOGGER.report("Checked #{url}, got #{response.size} utxo for addr #{addr}, attempt #{attempts}", :info)
+    end
+
+  rescue StandardError => e
+    LOGGER.report(e, :error, data: { attempt: attempts })
+    if attempts >= 3
+      send_alert(
+        "TxCatcher monitor error",
+        "While checking #{TxCatcher::Config["monitor"]["txcatcher_url"]} response, got the following error\n\n" +
+        "#{e.to_s}\n\n#{e.backtrace.join("\n")}"
+      )
+    end
+  end # begin/rescue
+end #while
+
+# Only report if we actually fetched something. Otherwise another error was probably reported already.
+

data/lib/tasks/db.rake

@@ -3,6 +3,7 @@ require 'yaml'
 require 'json'
 require 'sequel'
 require_relative '../txcatcher/utils/hash_string_to_sym_keys'
+require_relative '../txcatcher/logger'
 require_relative '../txcatcher/config'
 require_relative '../txcatcher/initializer'
 

data/lib/txcatcher/catcher.rb

@@ -9,7 +9,7 @@ module TxCatcher
      @sockets  = {}
 
       {'rawtx' => "#{socket}#{name}.rawtx", 'hashblock' => "#{socket}#{name}.hashblock"}.each do |channel, address|
-        Logger.report "Start listening on #{name} #{channel}... (#{address})"
+        LOGGER.report "Start listening on #{name} #{channel}... (#{address})"
         listen_to_zeromq_message(channel: channel, address: address)
       end
     end
@@ -32,16 +32,16 @@ module TxCatcher
         # before we start listening to any messages from ZeroMQ.
         queue_thread = Thread.new do
           loop do
-            Logger.report "in #{channel} queue: #{@queue[channel].size}" if Config["logger"]["log_queue_info"]
+            LOGGER.report "in #{channel} queue: #{@queue[channel].size}" if Config["logger"]["log_queue_info"]
             if @queue[channel].empty?
               sleep 1
             else
               begin
                 @queue[channel].pop.call
               rescue Sequel::ValidationFailed => e
-                Logger.report e, :warn, timestamp: true
+                LOGGER.report e, :warn, timestamp: true
               rescue Exception => e
-                Logger.report e, :error, timestamp: true
+                LOGGER.report e, :error, timestamp: true
               end
             end
           end
@@ -75,13 +75,13 @@ module TxCatcher
       end # listen_to_zeromq_message
 
       def handle_rawtx(txhex)
-        Logger.report "received tx hex: #{txhex[0..50]}..."
+        LOGGER.report "received tx hex: #{txhex[0..50]}..."
         @queue["rawtx"] << ( Proc.new {
           tx = TxCatcher::Transaction.new(hex: txhex)
           tx.save
-          Logger.report "tx #{tx.txid} saved (id: #{tx.id}), deposits (outputs):"
+          LOGGER.report "tx #{tx.txid} saved (id: #{tx.id}), deposits (outputs):"
           tx.deposits.each do |d|
-            Logger.report "  id: #{d.id}, addr: #{d.address.address}, amount: #{CryptoUnit.new(Config["currency"], d.amount, from_unit: :primary).to_standart}"
+            LOGGER.report "  id: #{d.id}, addr: #{d.address.address}, amount: #{CryptoUnit.new(Config["currency"], d.amount, from_unit: :primary).to_standart}"
           end
         })
       end
@@ -90,7 +90,7 @@ module TxCatcher
         block_hash   = TxCatcher.rpc_node.getblock(block_hex)
         transactions = block_hash["tx"]
         height       = TxCatcher.current_block_height = block_hash["height"].to_i
-        Logger.report "*** Block #{height} mined, transactions received:\n  #{transactions.join("  \n")}"
+        LOGGER.report "*** Block #{height} mined, transactions received:\n  #{transactions.join("  \n")}"
         @queue["hashblock"] << ( Proc.new {
           Transaction.where(txid: transactions).update(block_height: height)
         })

data/lib/txcatcher/cleaner.rb

@@ -19,14 +19,14 @@ module TxCatcher
           else
             TxCatcher::Transaction.count
           end
-          Logger.report "Cleaning transactions in DB..."
-          Logger.report "#{db_tx_count} now, needs to be below #{Config.max_db_transactions_stored}\n"
+          LOGGER.report "Cleaning transactions in DB..."
+          LOGGER.report "#{db_tx_count} now, needs to be below #{Config.max_db_transactions_stored}\n"
           if db_tx_count > Config.max_db_transactions_stored
             number_to_delete = (db_tx_count - Config.max_db_transactions_stored) + (Config.max_db_transactions_stored*0.1).round
             clean_transactions(number_to_delete)
-            Logger.report "DB cleaned: #{@@cleaning_counter.to_s}"
+            LOGGER.report "DB cleaned: #{@@cleaning_counter.to_s}"
           else
-            Logger.report "Nothing to be cleaned from DB, size is below threshold."
+            LOGGER.report "Nothing to be cleaned from DB, size is below threshold."
           end
           if @stop || run_once
             @@stopped = true
@@ -58,7 +58,7 @@ module TxCatcher
         t.times do
           limit = n <= 100 ? n : 100
           transactions.limit(limit).each do |t|
-            Logger.report "- Removing tx #{t.txid}"
+            LOGGER.report "- Removing tx #{t.txid}"
             clean_deposits(t)
             TxCatcher.db_connection[:transactions].filter(id: t.id).delete
             @@cleaning_counter[:transactions] += 1

data/lib/txcatcher/initializer.rb

@@ -1,6 +1,7 @@
 module TxCatcher
 
   VERSION = File.read(File.expand_path('../../', File.dirname(__FILE__)) + '/VERSION')
+  LOGGER = TxCatcher::Logger.new
 
   class << self
     attr_accessor :db_connection, :rpc_node, :current_block_height, :config_dir
@@ -156,7 +157,7 @@ module TxCatcher
       Raven.configure do |config|
         config.dsn = Config["logger"]["sentry_dsn"]
         config.current_environment = Config["environment"]
-      end if Config["logger"] && Config["logger"]["sentry_dsn"]
+      end if Config["logger"] && Config["logger"]["sentry_dsn"] && Config["logger"]["sentry_dsn"] != "test"
     end
 
   end

data/lib/txcatcher/logger.rb

@@ -10,65 +10,61 @@ module TxCatcher
       unknown: 5
     }
 
-    @@log_file_name       = "txcatcher.log"
-    @@error_log_file_name = "error.log"
-
-    class << self
+    def initialize(log_file: "txcatcher.log", error_file: "error.log", error_log_delimiter: "\n\n")
+      @log_file_name       = log_file
+      @error_log_file_name = error_file
+      @error_log_delimiter = error_log_delimiter
+    end
 
-      def set_log_file_names!(log: nil, error: nil)
-        @@log_file_name       = log   if log
-        @@error_log_file_name = error if error
-      end
 
-      def report(message, log_level=:info, data: nil, timestamp: false)
-        [:logfile, :stdout, :sentry].each do |out|
-          if LOG_LEVELS[log_level] >= LOG_LEVELS[Config["logger"]["#{out}_level"].to_sym]
-            send("report_to_#{out}", message, log_level, data: data, timestamp: timestamp) 
-          end
+    def report(message, log_level=:info, data: nil, timestamp: false)
+      [:logfile, :stdout, :sentry].each do |out|
+        if LOG_LEVELS[log_level] >= LOG_LEVELS[Config["logger"]["#{out}_level"].to_sym]
+          send("report_to_#{out}", message, log_level, data: data, timestamp: timestamp) 
         end
       end
+    end
 
-      private
+    private
 
-        def report_to_stdout(message, log_level, data: nil, timestamp: timestamp)
-          $stdout.print prepare_message(message, timestamp: timestamp) + "\n"
-          $stdout.print "  additional data: #{data.to_s}" if data
-          $stdout.print("\n\n") if LOG_LEVELS[log_level] >= LOG_LEVELS[:error]
-        end
+      def report_to_stdout(message, log_level, data: nil, timestamp: timestamp)
+        $stdout.print prepare_message(message, timestamp: timestamp) + "\n"
+        $stdout.print "  additional data: #{data.to_s}\n" if data
+        $stdout.print(@error_log_delimiter) if LOG_LEVELS[log_level] >= LOG_LEVELS[:error]
+      end
 
-        def report_to_logfile(message, log_level, data: nil, timestamp: true) # always gonna be forcing timestamp to be true here
-          fn = LOG_LEVELS[log_level] >= LOG_LEVELS[:error] ? @@error_log_file_name : @@log_file_name
-          fn = TxCatcher::Config.config_dir + "/#{fn}"
+      def report_to_logfile(message, log_level, data: nil, timestamp: true) # always gonna be forcing timestamp to be true here
+        fn = LOG_LEVELS[log_level] >= LOG_LEVELS[:error] ? @error_log_file_name : @log_file_name
+        fn = TxCatcher::Config.config_dir + "/#{fn}"
 
-          File.open(fn, "a") do |f|
-            f.print "#{prepare_message(message, timestamp: true)}\n"
-            f.print "  additional data: #{data.to_s}" if data
-            f.print("\n\n") if LOG_LEVELS[log_level] >= LOG_LEVELS[:error]
-          end
+        File.open(fn, "a") do |f|
+          f.print "#{prepare_message(message, timestamp: true)}\n"
+          f.print "  additional data: #{data.to_s}\n" if data
+          f.print(@error_log_delimiter) if LOG_LEVELS[log_level] >= LOG_LEVELS[:error]
         end
+      end
 
-        def report_to_sentry(e, log_level, data: nil, timestamp: timestamp)
-          return unless TxCatcher::Config["logger"]["sentry_dsn"]
-          data ||= {}
-          data.merge!(environment: Config["environment"], host: Config["host"], currency: Config["currency"])
-          Raven.tags_context data
-          e.kind_of?(Exception) ? Raven.capture_exception(e) : Raven.capture_message(e)
-        end
+      def report_to_sentry(e, log_level, data: nil, timestamp: timestamp)
+        return unless TxCatcher::Config["logger"]["sentry_dsn"]
+        data ||= {}
+        data.merge!(environment: Config["environment"], host: Config["host"], currency: Config["currency"])
+        Raven.tags_context data
+        e.kind_of?(Exception) ? Raven.capture_exception(e) : Raven.capture_message(e)
+      end
 
-        def prepare_message(e, timestamp: false)
-          result = if e.kind_of?(Exception)
-            result =  e.to_s + "\n"
-            result += e.message + "\n\n" if e.message != e.to_s
-            result += (e.backtrace&.join("\n") || "[no backtrace]")
-            result
-          else
-            e
-          end
-          result = "[#{Time.now}] #{result}" if timestamp
+      def prepare_message(e, timestamp: false)
+        result = if e.kind_of?(Exception)
+          result =  e.to_s + "\n"
+          result += e.message + "\n\n" if e.message != e.to_s
+          result += (e.backtrace&.join("\n") || "[no backtrace]")
           result
+        else
+          e
         end
+        result = "[#{Time.now}] #{result}" if timestamp
+        result
+      end
 
-    end
 
   end
 

data/lib/txcatcher/models/transaction.rb

@@ -62,9 +62,9 @@ module TxCatcher
         block_hash = TxCatcher.rpc_node.getblockhash(TxCatcher.current_block_height - i)
         block      = TxCatcher.rpc_node.getblock(block_hash)
         i += 1
-        Logger.report "--- checking block #{TxCatcher.current_block_height - i} for tx #{self.txid}"
+        LOGGER.report "--- checking block #{TxCatcher.current_block_height - i} for tx #{self.txid}"
         if block["tx"] && block["tx"].include?(self.txid)
-          Logger.report "tx #{self.txid} block height updated to #{block["height"]}"
+          LOGGER.report "tx #{self.txid} block height updated to #{block["height"]}"
           self.update(block_height: block["height"])
           return block["height"].to_i
         end

data/lib/txcatcher.rb

@@ -9,12 +9,12 @@ Sequel.extension :migration
 
 require_relative 'txcatcher/utils/crypto_unit'
 require_relative 'txcatcher/utils/hash_string_to_sym_keys'
+require_relative 'txcatcher/logger'
 require_relative 'txcatcher/bitcoin_rpc'
 require_relative 'txcatcher/config'
 require_relative 'txcatcher/initializer'
 require_relative 'txcatcher/catcher'
 require_relative 'txcatcher/cleaner'
-require_relative 'txcatcher/logger'
 
 include TxCatcher::Initializer
 prepare

data/spec/logger_spec.rb

@@ -1,17 +1,17 @@
 require 'rubygems'
 require_relative 'spec_helper'
 
-RSpec.describe TxCatcher::Logger do
+RSpec.describe TxCatcher::LOGGER do
 
   describe "logging to logfiles" do
 
     it "writes info messages to txcatcher.log" do
-      TxCatcher::Logger.report "example info message", :info
+      TxCatcher::LOGGER.report "example info message", :info
       expect(File.read(LOGFILE)).to include("example info message")
     end
 
     it "writes errors into a separate error.log file" do
-      TxCatcher::Logger.report "example error message", :error
+      TxCatcher::LOGGER.report "example error message", :error
       expect(File.read(ERRFILE)).to include("example error message")
     end
 
@@ -21,44 +21,44 @@ RSpec.describe TxCatcher::Logger do
 
     it "logs messages to Sentry" do
       expect(Raven).to receive(:capture_message).once
-      TxCatcher::Logger.report "example info message", :info
-      TxCatcher::Logger.report "example error message", :error
+      TxCatcher::LOGGER.report "example info message", :info
+      TxCatcher::LOGGER.report "example error message", :error
     end
 
     it "logs errors to Sentry" do
       expect(Raven).to receive(:capture_exception).once
-      TxCatcher::Logger.report StandardError.new, :error
+      TxCatcher::LOGGER.report StandardError.new, :error
     end
 
   end
 
   it "logs to stdout" do
     expect($stdout).to receive(:print).exactly(3).times
-    TxCatcher::Logger.report "example info message", :info
-    TxCatcher::Logger.report "example error message", :error
+    TxCatcher::LOGGER.report "example info message", :info
+    TxCatcher::LOGGER.report "example error message", :error
   end
 
   it "doesn't log an message if its loglevel is below current threshold" do
     TxCatcher::Config["logger"]["stdout_level"] = "fatal"
     expect($stdout).to receive(:print).exactly(2).times
-    TxCatcher::Logger.report "example info message",  :info
-    TxCatcher::Logger.report "example warn message",  :warn
-    TxCatcher::Logger.report "example error message", :error
-    TxCatcher::Logger.report "example fatal message", :fatal
+    TxCatcher::LOGGER.report "example info message",  :info
+    TxCatcher::LOGGER.report "example warn message",  :warn
+    TxCatcher::LOGGER.report "example error message", :error
+    TxCatcher::LOGGER.report "example fatal message", :fatal
     TxCatcher::Config["logger"]["stdout_level"] = "info"
   end
 
   it "converts Exception into a text for logging" do
     expect($stdout).to receive(:print).with("StandardError\n[no backtrace]\n")
     expect($stdout).to receive(:print).with("\n\n")
-    TxCatcher::Logger.report StandardError.new, :error
+    TxCatcher::LOGGER.report StandardError.new, :error
   end
 
   it "prints additional data passed along" do
     expect($stdout).to receive(:print).with("example error message\n")
-    expect($stdout).to receive(:print).with('  additional data: {:hello=>"world"}')
+    expect($stdout).to receive(:print).with('  additional data: {:hello=>"world"}' + "\n")
     expect($stdout).to receive(:print).with("\n\n")
-    TxCatcher::Logger.report "example error message", :error, data: { hello: "world" }
+    TxCatcher::LOGGER.report "example error message", :error, data: { hello: "world" }
   end
 
 end

data/txcatcher.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: txcatcher 0.1.88 ruby lib
+# stub: txcatcher 0.1.89 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "txcatcher"
-  s.version = "0.1.88"
+  s.version = "0.1.89"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txcatcher
 version: !ruby/object:Gem::Version
-  version: 0.1.88
+  version: 0.1.89
 platform: ruby
 authors:
 - Roman Snitko