From abb545e2264d8cc136db3aee5ee6c3d064068943 Mon Sep 17 00:00:00 2001
From: roadscape <roadscape@users.noreply.github.com>
Date: Tue, 19 Sep 2017 18:40:52 -0500
Subject: [PATCH] add separate JUSSI_URL env, use it to branch
---
docker-compose.yml | 3 ++-
hive/indexer/utils.py | 22 +++++++++++++---------
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index f84358395..50fd7e9a4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,8 @@ services:
environment:
DATABASE_URL: mysql://root:root_password@mysql:3306/testdb
LOG_LEVEL: DEBUG
- STEEMD_URL: https://api.steemitdev.com
+ STEEMD_URL: https://steemd.steemit.com
+ JUSSI_URL: https://api.steemitdev.com
links:
- mysql:db
ports:
diff --git a/hive/indexer/utils.py b/hive/indexer/utils.py
index 4e2c5d32b..602f4545d 100644
--- a/hive/indexer/utils.py
+++ b/hive/indexer/utils.py
@@ -28,16 +28,19 @@ _shared_adapter = None
def get_adapter():
global _shared_adapter
if not _shared_adapter:
- url = os.environ.get('STEEMD_URL')
- assert url, 'STEEMD_URL undefined'
- _shared_adapter = SteemAdapter(url)
+ steem = os.environ.get('STEEMD_URL')
+ jussi = os.environ.get('JUSSI_URL')
+ _shared_adapter = SteemAdapter(steem, jussi)
return _shared_adapter
class SteemAdapter:
- def __init__(self, api_endpoint):
- self._client = HttpClient(nodes=[api_endpoint])
+ def __init__(self, api_endpoint, jussi=None):
+ self._jussi = bool(jussi)
+ url = jussi or api_endpoint
+ assert url, 'steem-API endpoint undefined'
+ self._client = HttpClient(nodes=[url])
def get_accounts(self, accounts):
return self.__exec('get_accounts', accounts)
@@ -79,11 +82,12 @@ class SteemAdapter:
return [blocks[x] for x in block_nums]
- def __exec_multi(self, method, params, max_workers=10):
- return self._client.exec_multi_with_futures(method, params, max_workers=10)
-
def __exec(self, method, *params):
return self._client.exec(method, *params)
def __exec_batch(self, method, params):
- return self._client.exec_batch(method, params)
+ """If jussi is enabled, use batch requests; otherwise, multi"""
+ if self._jussi:
+ return self._client.exec_batch(method, params)
+ else:
+ return self._client.exec_multi_with_futures(method, params, max_workers=10)
--
GitLab