From 996f4a45dffb445cecf00afe889a62aec81ca65c Mon Sep 17 00:00:00 2001 From: andrewso <9V5f1FkzI2LD> Date: Tue, 6 Oct 2020 16:01:08 +0100 Subject: [PATCH] [06.10.20] Fixed some logging --- src/pricing/collector.py | 37 +++++++++++++++++-------------- src/pricing/exchanges/bitfinex.py | 6 ++--- src/pricing/exchanges/bitstamp.py | 8 +++---- src/pricing/exchanges/coinbase.py | 4 +--- src/pricing/exchanges/gemini.py | 8 +++---- src/pricing/exchanges/kraken.py | 8 +++---- 6 files changed, 32 insertions(+), 39 deletions(-) diff --git a/src/pricing/collector.py b/src/pricing/collector.py index c7e463a..6cf41c4 100644 --- a/src/pricing/collector.py +++ b/src/pricing/collector.py @@ -26,8 +26,8 @@ def averager(type): timestamp = datetime.datetime.now() + datetime.timedelta(hours=1) - bitstampH, bitstampL = bitstampHighLow(type) - krakenH, krakenL = krakenHighLow(type) + bitstampH, bitstampL = bitstampHighLow(type, log) + krakenH, krakenL = krakenHighLow(type, log) bitstamp_P = (bitstampH + bitstampL)/2 kraken_P = (krakenH + krakenL)/2 @@ -42,10 +42,10 @@ def averager(type): return averagePrice, timestamp def getVol(type): - bitV, bitA, bitB = bitstampVolAskBid(type) - kV, kA, kB = krakenVolAskBid(type) - bV, bA, bB = bitfinexVolAskBid(type) - gV, gA, gB = geminiVolAskBid(type) + bitV, bitA, bitB = bitstampVolAskBid(type, log) + kV, kA, kB = krakenVolAskBid(type, log) + bV, bA, bB = bitfinexVolAskBid(type, log) + gV, gA, gB = geminiVolAskBid(type, log) v_array = np.array([bitV, kV, bV, gV]) @@ -54,8 +54,8 @@ def getVol(type): return volume def getHighLow(type): - kH, kL = krakenHighLow(type) - bH, bL = bitstampHighLow(type) + kH, kL = krakenHighLow(type, log) + bH, bL = bitstampHighLow(type, log) h_array = np.array([kH, bH]) l_array = np.array([kL, bL]) @@ -66,8 +66,8 @@ def getHighLow(type): return high, low def getOpenClose(type): - bO, bC = bitstampOpenClose(type) - kO, kC = krakenOpenClose(type) + bO, bC = bitstampOpenClose(type, log) + kO, kC = krakenOpenClose(type, log) o_array = np.array([bO, kO]) c_array = np.array([bC, kC]) @@ -95,14 +95,14 @@ def sendToGateway(c_type, timestamp, av_price, high, low, vol, o_price, c_price) log("Query sending down to db-gateway -- ({})".format(query), 'INFO') - status, response = send(query, log) + # status, response = send(query, log) - if status != 200: - log("Query wasn't executed properly, view logs. Status = {}".format(status), 'WARN') - log("With Response of : {}".format(response), 'ERR') - else: - log("Query executed successfully with Status = {}".format(status), 'INFO') - log("With Response of : {}".format(response), 'INFO') + # if status != 200: + # log("Query wasn't executed properly, view logs. Status = {}".format(status), 'WARN') + # log("With Response of : {}".format(response), 'ERR') + # else: + # log("Query executed successfully with Status = {}".format(status), 'INFO') + # log("With Response of : {}".format(response), 'INFO') def sentToArtemis(c_type, timestamp, av_price, high, low, vol, o_price, c_price): @@ -123,6 +123,7 @@ def sentToArtemis(c_type, timestamp, av_price, high, low, vol, o_price, c_price) messageJson = json.dumps(message, indent = 4) log("Sending message to PricingSave queue", 'INFO') + log("Message: {}".format(message), 'INFO') activeMQSender(messageJson) @@ -158,6 +159,8 @@ def collector(c_type): schedule.every().hour.at(time).do(collector, c_type).tag("collector") + log("Collection will run again at {} every hour".format(time), 'INFO') + # Dynamically Spin up Child process for each type wanting to track def collectorMain(c_type): log("== Historical Price Collector ==", 'INFO') diff --git a/src/pricing/exchanges/bitfinex.py b/src/pricing/exchanges/bitfinex.py index dff6dc8..95071e8 100644 --- a/src/pricing/exchanges/bitfinex.py +++ b/src/pricing/exchanges/bitfinex.py @@ -2,9 +2,7 @@ import requests, json, sys -from src.utils.jsonLogger import log - -def bitfinexPublicTicker(type): +def bitfinexPublicTicker(type, log): try: uri = "https://api.bitfinex.com/v2/tickers?symbols=" + "t"+type.upper().replace('_', '') @@ -19,7 +17,7 @@ def bitfinexPublicTicker(type): price = 0 return price -def bitfinexVolAskBid(type): +def bitfinexVolAskBid(type, log): try: uri = "https://api.bitfinex.com/v2/tickers?symbols=" + "t"+type.upper().replace('_', '') diff --git a/src/pricing/exchanges/bitstamp.py b/src/pricing/exchanges/bitstamp.py index fdbf830..6bf6cf8 100644 --- a/src/pricing/exchanges/bitstamp.py +++ b/src/pricing/exchanges/bitstamp.py @@ -2,9 +2,7 @@ import requests, json, sys -from src.utils.jsonLogger import log - -def bitstampVolAskBid(type): +def bitstampVolAskBid(type, log): try: uri = "https://www.bitstamp.net/api/v2/ticker_hour/" + type.lower().replace('_', '') + "/" response = requests.request("GET", uri) @@ -19,7 +17,7 @@ def bitstampVolAskBid(type): log("Bitstamp Volume Ask Bid Error: {}".format(e), 'ERR') return 0, 0, 0 -def bitstampOpenClose(type): +def bitstampOpenClose(type, log): try: uri = "https://www.bitstamp.net/api/v2/ticker_hour/" + type.lower().replace('_', '') + "/" response = requests.request("GET", uri) @@ -33,7 +31,7 @@ def bitstampOpenClose(type): log("Bitstamp Open Close Error: {}".format(e), 'ERR') return 0, 0 -def bitstampHighLow(type): +def bitstampHighLow(type, log): try: uri = "https://www.bitstamp.net/api/v2/ticker_hour/" + type.lower().replace('_', '') + "/" response = requests.request("GET", uri) diff --git a/src/pricing/exchanges/coinbase.py b/src/pricing/exchanges/coinbase.py index 7061507..d799345 100644 --- a/src/pricing/exchanges/coinbase.py +++ b/src/pricing/exchanges/coinbase.py @@ -4,15 +4,13 @@ import sys, os from coinbase.wallet.client import Client -from src.utils.jsonLogger import log - class keys(): def __init__(self): self.api_key = os.getenv('COINBASE_KEY') self.api_secret = os.getenv("COINBASE_SECRET") -def coinbasePublicTicker(type): +def coinbasePublicTicker(type, log): api_key = keys().api_key api_secret = keys().api_secret diff --git a/src/pricing/exchanges/gemini.py b/src/pricing/exchanges/gemini.py index 7e0f2f5..e4cf1be 100644 --- a/src/pricing/exchanges/gemini.py +++ b/src/pricing/exchanges/gemini.py @@ -2,9 +2,7 @@ import requests, json, sys -from src.utils.jsonLogger import log - -def geminiPublicTicker(type): +def geminiPublicTicker(type, log): try: uri = "https://api.gemini.com/v1/pubticker/" + type.lower().replace('_', '') @@ -21,7 +19,7 @@ def geminiPublicTicker(type): price = 0 return price -def geminiVolAskBid(type): +def geminiVolAskBid(type, log): try: uri = "https://api.gemini.com/v2/ticker/" + type.lower().replace('_', '') response = requests.request("GET", uri) @@ -41,7 +39,7 @@ def geminiVolAskBid(type): log("Gemini Volume Ask Bid Error: {}".format(e), 'ERR') return 0, 0, 0 -def geminiDailyOpenClose(type): +def geminiDailyOpenClose(type, log): try: uri = "https://api.gemini.com/v2/ticker/" + type.lower().replace('_', '') response = requests.request("GET", uri) diff --git a/src/pricing/exchanges/kraken.py b/src/pricing/exchanges/kraken.py index bd5dd20..ae08770 100644 --- a/src/pricing/exchanges/kraken.py +++ b/src/pricing/exchanges/kraken.py @@ -2,8 +2,6 @@ import requests, json, sys -from src.utils.jsonLogger import log - def krakenCalculateOHLC(response): open, high, low, close = 0, 0, 0, 0 @@ -23,7 +21,7 @@ def krakenCalculateOHLC(response): return fopen, fhigh, flow, fclose -def krakenVolAskBid(type): +def krakenVolAskBid(type, log): try: uri = "https://api.kraken.com/0/public/Ticker?pair=" + type.upper().replace('_', '').replace('BTC', 'XBT') response = requests.request("GET", uri) @@ -42,7 +40,7 @@ def krakenVolAskBid(type): log("Kraken Volume Ask Bid Error: {}".format(e), 'ERR') return 0, 0, 0 -def krakenOpenClose(type): +def krakenOpenClose(type, log): try: uri = "https://api.kraken.com/0/public/OHLC?pair=" + type.upper().replace('_', '').replace('BTC', 'XBT') + "&?interval\=60" response = requests.request("GET", uri) @@ -58,7 +56,7 @@ def krakenOpenClose(type): log("Kraken Open Close Error: {}".format(e), 'ERR') return 0, 0, 0 -def krakenHighLow(type): +def krakenHighLow(type, log): try: uri = "https://api.kraken.com/0/public/OHLC?pair=" + type.upper().replace('_', '').replace('BTC', 'XBT') + "&?interval\=60" response = requests.request("GET", uri)