Merge branch 'master' of https://github.com/gileadmcgee/python-graphe…

…nelib
xeroc · Oct 18, 2015 · b536a1c · b536a1c
2 parents 5db1c33 + 69bf492
commit b536a1c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/scripts/pricefeeds/config-example.py b/scripts/pricefeeds/config-example.py
@@ -10,7 +10,7 @@
 ################################################################################
 ## Delegate Feed Publish Parameters
 ################################################################################
-delegate_name            = "delegate.xeroc"
+delegate_name            = "init0"
 maxAgeFeedInSeconds      = 60*60 # 1hour
 
 ################################################################################
@@ -21,6 +21,15 @@
 
 minValidAssetPriceInBTC  = 0.00001
 change_min               = 0.5
+
+## Enable exchanges
+enable_yunbi             = True
+enable_btc38             = True
+enable_bter              = False
+enable_poloniex           = True
+enable_bittrex           = True
+enable_btcavg            = True
+
 ## trust level for exchanges (if an exception happens and level is 0.8 script
 ##                            will quit with a failure)
 btc38_trust_level        = 0.9

diff --git a/scripts/pricefeeds/pricefeeds.py b/scripts/pricefeeds/pricefeeds.py
@@ -486,12 +486,12 @@ def bts_yahoo_map(asset) :
  ## Get prices and stats ######################################################
  mythreads = {}
  mythreads["yahoo"]    = threading.Thread(target = fetch_from_yahoo)
- mythreads["yunbi"]    = threading.Thread(target = fetch_from_yunbi)
- mythreads["btc38"]    = threading.Thread(target = fetch_from_btc38)
- mythreads["bter"]     = threading.Thread(target = fetch_from_bter)
- mythreads["poloniex"] = threading.Thread(target = fetch_from_poloniex)
- mythreads["bittrex"]  = threading.Thread(target = fetch_from_bittrex)
- mythreads["btcavg"]   = threading.Thread(target = fetch_bitcoinaverage)
+ if config.enable_yunbi    :  mythreads["yunbi"]    = threading.Thread(target = fetch_from_yunbi)
+ if config.enable_btc38    :  mythreads["btc38"]    = threading.Thread(target = fetch_from_btc38)
+ if config.enable_bter     :  mythreads["bter"]     = threading.Thread(target = fetch_from_bter)
+ if config.enable_poloniex :  mythreads["poloniex"] = threading.Thread(target = fetch_from_poloniex)
+ if config.enable_bittrex  :  mythreads["bittrex"]  = threading.Thread(target = fetch_from_bittrex)
+ if config.enable_btcavg   :  mythreads["btcavg"]   = threading.Thread(target = fetch_bitcoinaverage)
 
  print("[Starting Threads]: ", end="",flush=True)
  for t in mythreads :