rapflag 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72ac31a1ed8f02d2602c12a87d0ca55a79b00d67
-  data.tar.gz: c6e7abce5e56208207a88a2d98b585555f25cdae
+  metadata.gz: 49743ea60e2bd47dfbdf5ad864c4b7119ba0e7d0
+  data.tar.gz: fd4883603a73ad3512d1ee771d22852aa77b3262
 SHA512:
-  metadata.gz: e72b855a3bf4f541f72abd75dbdb3ef2a3150fdd2e71ffced58c22b41d4fc19c51af6cf817e1421308f2ce56405020c4a0d77861d9ee85ccc6fd3c7715455217
-  data.tar.gz: 00c95b069c5eb24d6ec2eb50e958bdb40aba1cd341ae238be597b0d8c573788f1c7fa9b1de2099f32c2510647081042888083daa942886295bda673c216adc97
+  metadata.gz: d21582fab1a3105f8e9cb169766b02e574f216608182f3476664665ef80af766c96185b938012e228a0da4f88ae7ead744cfcd56a77c02cd9853ae4f0a08f294
+  data.tar.gz: 8ebc39817d2a380fc81401a021dda7225e7771000697682670ebc7cee7c9ddc4b061384b12e20511b299fde8fc4e2be3f5c42936e4cfe8ba3f3e8299d37db3c4

data/History.md

@@ -1,6 +1,10 @@
+# 0.0.8 of 2017.04.17
+
+* Wait (possibly several times) when we hit the rate limiter of the bitfinex REST API while fetching the currency rates
+
 # 0.0.7 of 2017.04.17
 
-* Wait (possibly several times) when we hit the rate limiter of the bitfinex REST API
+* Wait (possibly several times) when we hit the rate limiter of the bitfinex REST API while fetching the histor
 
 # 0.0.6 of 2017.04.11
 

data/lib/rapflag/bitfinex.rb

@@ -9,6 +9,7 @@ module RAPFLAG
   class Bitfinex < History
     @@btc_to_usd = {}
     @@bfx_to_usd = {}
+    Delay_in_seconds = 30
 
     def get_usd_exchange(date_time = Time.now, from='BTC')
       return 1.0 if from == 'USD'
@@ -20,18 +21,22 @@ module RAPFLAG
       ms_next_date = ms + (3*24*3600)*1000
       # this does not work
       # url = "https://api.bitfinex.com/v2/candles/trade:1D:t#{from}USD/hist?start:#{ms}?end:#{ms_next_date}"
-      url = "https://api.bitfinex.com/v2/candles/trade:1D:t#{from}USD/hist?start:#{ms}?end:#{ms_next_date}"
       # therefore we just return the most uptodate
       url = "https://api.bitfinex.com/v2/candles/trade:1D:t#{from}USD/hist?start:#{ms}"
-      puts "Fetching #{date_time}: #{url} #{@@btc_to_usd.size} BTC #{@@bfx_to_usd.size} BFX" if $VERBOSE
-      response = Faraday.get(url)
-      items = eval(response.body)
       rates = {}
-      items.each do |item|
-        if item.first.eql?(:error)
-          puts "Fetching returned #{item}. Aborting"
-          exit(1)
+      while true
+        puts "Fetching #{date_time}: #{url} #{@@btc_to_usd.size} BTC #{@@bfx_to_usd.size} BFX" if $VERBOSE
+        response = Faraday.get(url)
+        items = eval(response.body)
+        if items && items.size > 0 && items.first.first.eql?(:error)
+          puts "#{Time.now}: Fetching #{url} returned #{items.first}."
+          puts "   Retrying in #{Delay_in_seconds} seconds"
+          sleep(Delay_in_seconds)
+        else
+          break
         end
+      end
+      items.each do |item|
         # http://docs.bitfinex.com/v2/reference#rest-public-candles
         # field definitions for  [ MTS, OPEN, CLOSE, HIGH, LOW, VOLUME ],
         # MTS   int   millisecond time stamp
@@ -46,13 +51,14 @@ module RAPFLAG
       end;
       from.eql?('BTC') ? @@btc_to_usd = rates.clone : @@bfx_to_usd = rates.clone
       rates[key] ? rates[key] : nil
-    rescue => err
-      puts "Err #{err}"
+    rescue => error
+      puts "error #{error}"
+      puts " backtrace: #{error.backtrace[0..10].join("\n")}"
+      require 'pry'; binding.pry
     end
 
     def fetch_csv_history
       @history = []
-      delay_in_seconds = 30
       check_config
       client = ::Bitfinex::Client.new
       timestamp = Time.now.to_i + 1
@@ -63,8 +69,8 @@ module RAPFLAG
             partial = client.history(@currency, { :limit => 1000, :until => timestamp, :wallet => @wallet})
             if partial.is_a?(Hash) && (partial.size > 0) && partial['error'].eql?('ERR_RATE_LIMIT')
               puts "Got #{partial['error']} while fetching #{@wallet} #{@currency} #{client.history} items"
-              puts "  Will wait #{delay_in_seconds} seconds before retrying"
-              sleep(delay_in_seconds)
+              puts "  Will wait #{Delay_in_seconds} seconds before retrying"
+              sleep(Delay_in_seconds)
             end
             break if partial && partial.is_a?(Array)
           end

data/lib/rapflag/version.rb

@@ -1,4 +1,4 @@
 module RAPFLAG
   Wallets = ['trading', 'exchange', 'deposit']
-  VERSION='0.0.7'
+  VERSION='0.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapflag
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Zeno R.R. Davatz, Niklaus Giger