diff --git a/lbry/wallet/server/db/elasticsearch/search.py b/lbry/wallet/server/db/elasticsearch/search.py index e7a8b58af..c762920ef 100644 --- a/lbry/wallet/server/db/elasticsearch/search.py +++ b/lbry/wallet/server/db/elasticsearch/search.py @@ -42,8 +42,7 @@ class IndexVersionMismatch(Exception): class SearchIndex: VERSION = 1 - def __init__(self, index_prefix: str, search_timeout=3.0, elastic_host='localhost', elastic_port=9200, - half_life=0.4, whale_threshold=10000, whale_half_life=0.99): + def __init__(self, index_prefix: str, search_timeout=3.0, elastic_host='localhost', elastic_port=9200): self.search_timeout = search_timeout self.sync_timeout = 600 # wont hit that 99% of the time, but can hit on a fresh import self.search_client: Optional[AsyncElasticsearch] = None @@ -54,9 +53,6 @@ class SearchIndex: self.search_cache = LRUCache(2 ** 17) self._elastic_host = elastic_host self._elastic_port = elastic_port - self._trending_half_life = half_life - self._trending_whale_threshold = whale_threshold - self._trending_whale_half_life = whale_half_life async def get_index_version(self) -> int: try: diff --git a/lbry/wallet/server/env.py b/lbry/wallet/server/env.py index ff9e2a316..16490b0d4 100644 --- a/lbry/wallet/server/env.py +++ b/lbry/wallet/server/env.py @@ -30,7 +30,6 @@ class Env: def __init__(self, coin=None): self.logger = class_logger(__name__, self.__class__.__name__) - self.allow_root = self.boolean('ALLOW_ROOT', False) self.host = self.default('HOST', 'localhost') self.rpc_host = self.default('RPC_HOST', 'localhost') self.elastic_host = self.default('ELASTIC_HOST', 'localhost') @@ -38,17 +37,8 @@ class Env: self.loop_policy = self.set_event_loop_policy() self.obsolete(['UTXO_MB', 'HIST_MB', 'NETWORK']) self.db_dir = self.required('DB_DIRECTORY') - self.db_engine = self.default('DB_ENGINE', 'leveldb') - # self.trending_algorithms = [ - # trending for trending in set(self.default('TRENDING_ALGORITHMS', 'zscore').split(' ')) if trending - # ] - self.trending_half_life = math.log2(0.1 ** (1 / (3 + self.integer('TRENDING_DECAY_RATE', 48)))) + 1 - self.trending_whale_half_life = math.log2(0.1 ** (1 / (3 + self.integer('TRENDING_WHALE_DECAY_RATE', 24)))) + 1 - self.trending_whale_threshold = float(self.integer('TRENDING_WHALE_THRESHOLD', 10000)) * 1E8 self.max_query_workers = self.integer('MAX_QUERY_WORKERS', 4) - self.individual_tag_indexes = self.boolean('INDIVIDUAL_TAG_INDEXES', True) - self.track_metrics = self.boolean('TRACK_METRICS', False) self.websocket_host = self.default('WEBSOCKET_HOST', self.host) self.websocket_port = self.integer('WEBSOCKET_PORT', None) self.daemon_url = self.required('DAEMON_URL') @@ -85,18 +75,17 @@ class Env: self.peer_discovery = self.peer_discovery_enum() self.peer_announce = self.boolean('PEER_ANNOUNCE', True) self.peer_hubs = self.extract_peer_hubs() - self.force_proxy = self.boolean('FORCE_PROXY', False) - self.tor_proxy_host = self.default('TOR_PROXY_HOST', 'localhost') - self.tor_proxy_port = self.integer('TOR_PROXY_PORT', None) + # self.tor_proxy_host = self.default('TOR_PROXY_HOST', 'localhost') + # self.tor_proxy_port = self.integer('TOR_PROXY_PORT', None) # The electrum client takes the empty string as unspecified self.payment_address = self.default('PAYMENT_ADDRESS', '') self.donation_address = self.default('DONATION_ADDRESS', '') # Server limits to help prevent DoS self.max_send = self.integer('MAX_SEND', 1000000) self.max_receive = self.integer('MAX_RECEIVE', 1000000) - self.max_subs = self.integer('MAX_SUBS', 250000) + # self.max_subs = self.integer('MAX_SUBS', 250000) self.max_sessions = self.sane_max_sessions() - self.max_session_subs = self.integer('MAX_SESSION_SUBS', 50000) + # self.max_session_subs = self.integer('MAX_SESSION_SUBS', 50000) self.session_timeout = self.integer('SESSION_TIMEOUT', 600) self.drop_client = self.custom("DROP_CLIENT", None, re.compile) self.description = self.default('DESCRIPTION', '') diff --git a/lbry/wallet/server/leveldb.py b/lbry/wallet/server/leveldb.py index d33b1016b..dbf9b089c 100644 --- a/lbry/wallet/server/leveldb.py +++ b/lbry/wallet/server/leveldb.py @@ -106,8 +106,6 @@ class LevelDB: self.encoded_headers = LRUCacheWithMetrics(1 << 21, metric_name='encoded_headers', namespace='wallet_server') self.last_flush = time.time() - self.logger.info(f'using {self.env.db_engine} for DB backend') - # Header merkle cache self.merkle = Merkle() self.header_mc = MerkleCache(self.merkle, self.fs_block_hashes) @@ -125,9 +123,7 @@ class LevelDB: # Search index self.search_index = SearchIndex( self.env.es_index_prefix, self.env.database_query_timeout, - elastic_host=env.elastic_host, elastic_port=env.elastic_port, - half_life=self.env.trending_half_life, whale_threshold=self.env.trending_whale_threshold, - whale_half_life=self.env.trending_whale_half_life + elastic_host=env.elastic_host, elastic_port=env.elastic_port ) self.genesis_bytes = bytes.fromhex(self.coin.GENESIS_HASH)