From 0e548b381235c3e5b600560e0a56e1b70bda4763 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Sat, 16 Oct 2021 17:22:33 -0400 Subject: [PATCH] remove dead code --- lbry/wallet/server/session.py | 8 ---- lbry/wallet/server/text.py | 82 ----------------------------------- 2 files changed, 90 deletions(-) delete mode 100644 lbry/wallet/server/text.py diff --git a/lbry/wallet/server/session.py b/lbry/wallet/server/session.py index ca4a0142f..2d564cf29 100644 --- a/lbry/wallet/server/session.py +++ b/lbry/wallet/server/session.py @@ -2,8 +2,6 @@ import os import ssl import math import time -import json -import base64 import codecs import typing import asyncio @@ -15,8 +13,6 @@ from asyncio import Event, sleep from collections import defaultdict from functools import partial -from concurrent.futures import ProcessPoolExecutor, ThreadPoolExecutor - from elasticsearch import ConnectionTimeout from prometheus_client import Counter, Info, Histogram, Gauge @@ -27,7 +23,6 @@ from lbry.schema.result import Outputs from lbry.wallet.server.block_processor import BlockProcessor from lbry.wallet.server.leveldb import LevelDB from lbry.wallet.server.websocket import AdminWebSocket -from lbry.wallet.server.metrics import ServerLoadData, APICallMetrics from lbry.wallet.rpc.framing import NewlineFramer import lbry.wallet.server.version as VERSION @@ -36,13 +31,11 @@ from lbry.wallet.rpc import ( RPCSession, JSONRPCAutoDetect, JSONRPCConnection, handler_invocation, RPCError, Request, JSONRPC, Notification, Batch ) -from lbry.wallet.server import text from lbry.wallet.server import util from lbry.wallet.server.hash import sha256, hash_to_hex_str, hex_str_to_hash, HASHX_LEN, Base58Error from lbry.wallet.server.daemon import DaemonError if typing.TYPE_CHECKING: from lbry.wallet.server.env import Env - from lbry.wallet.server.mempool import MemPool from lbry.wallet.server.daemon import Daemon BAD_REQUEST = 1 @@ -264,7 +257,6 @@ class SessionManager: await self._start_external_servers() paused = False - def _group_map(self): group_map = defaultdict(list) for session in self.sessions.values(): diff --git a/lbry/wallet/server/text.py b/lbry/wallet/server/text.py deleted file mode 100644 index 4919b0c01..000000000 --- a/lbry/wallet/server/text.py +++ /dev/null @@ -1,82 +0,0 @@ -import time - -from lbry.wallet.server import util - - -def sessions_lines(data): - """A generator returning lines for a list of sessions. - - data is the return value of rpc_sessions().""" - fmt = ('{:<6} {:<5} {:>17} {:>5} {:>5} {:>5} ' - '{:>7} {:>7} {:>7} {:>7} {:>7} {:>9} {:>21}') - yield fmt.format('ID', 'Flags', 'Client', 'Proto', - 'Reqs', 'Txs', 'Subs', - 'Recv', 'Recv KB', 'Sent', 'Sent KB', 'Time', 'Peer') - for (id_, flags, peer, client, proto, reqs, txs_sent, subs, - recv_count, recv_size, send_count, send_size, time) in data: - yield fmt.format(id_, flags, client, proto, - f'{reqs:,d}', - f'{txs_sent:,d}', - f'{subs:,d}', - f'{recv_count:,d}', - '{:,d}'.format(recv_size // 1024), - f'{send_count:,d}', - '{:,d}'.format(send_size // 1024), - util.formatted_time(time, sep=''), peer) - - -def groups_lines(data): - """A generator returning lines for a list of groups. - - data is the return value of rpc_groups().""" - - fmt = ('{:<6} {:>9} {:>9} {:>6} {:>6} {:>8}' - '{:>7} {:>9} {:>7} {:>9}') - yield fmt.format('ID', 'Sessions', 'Bwidth KB', 'Reqs', 'Txs', 'Subs', - 'Recv', 'Recv KB', 'Sent', 'Sent KB') - for (id_, session_count, bandwidth, reqs, txs_sent, subs, - recv_count, recv_size, send_count, send_size) in data: - yield fmt.format(id_, - f'{session_count:,d}', - '{:,d}'.format(bandwidth // 1024), - f'{reqs:,d}', - f'{txs_sent:,d}', - f'{subs:,d}', - f'{recv_count:,d}', - '{:,d}'.format(recv_size // 1024), - f'{send_count:,d}', - '{:,d}'.format(send_size // 1024)) - - -def peers_lines(data): - """A generator returning lines for a list of peers. - - data is the return value of rpc_peers().""" - def time_fmt(t): - if not t: - return 'Never' - return util.formatted_time(now - t) - - now = time.time() - fmt = ('{:<30} {:<6} {:>5} {:>5} {:<17} {:>4} ' - '{:>4} {:>8} {:>11} {:>11} {:>5} {:>20} {:<15}') - yield fmt.format('Host', 'Status', 'TCP', 'SSL', 'Server', 'Min', - 'Max', 'Pruning', 'Last Good', 'Last Try', - 'Tries', 'Source', 'IP Address') - for item in data: - features = item['features'] - hostname = item['host'] - host = features['hosts'][hostname] - yield fmt.format(hostname[:30], - item['status'], - host.get('tcp_port') or '', - host.get('ssl_port') or '', - features['server_version'] or 'unknown', - features['protocol_min'], - features['protocol_max'], - features['pruning'] or '', - time_fmt(item['last_good']), - time_fmt(item['last_try']), - item['try_count'], - item['source'][:20], - item['ip_addr'] or '')