Skip to content

Commit dcdc101

Browse files
committed
we are not using threading but just in case in the future
1 parent a21b3e0 commit dcdc101

File tree

5 files changed

+18
-8
lines changed

5 files changed

+18
-8
lines changed

api/api.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from middleware.asgi_logger import AccessLoggerMiddleware
2020
from middleware.server_timing import ServerTimingMiddleware
2121
from util.cache import Cache
22-
from util.set_proc_title import set_proc_title
22+
from util.set_proc_title import set_thread_title
2323
from .address_routes import address_staking_route, address_delegated_route, address_program_id_route
2424
from .execute_routes import preview_finalize_route
2525
from .mapping_routes import mapping_route, mapping_list_route, mapping_value_list_route, mapping_key_count_route
@@ -81,7 +81,7 @@ async def noop(_: Any): pass
8181
app.state.db = db
8282
app.state.program_cache = Cache()
8383
app.state.session = aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=1))
84-
set_proc_title("aleo-explorer: api")
84+
set_thread_title("aleo-explorer: api")
8585

8686
log_format = '\033[92mAPI\033[0m: \033[94m%(client_addr)s\033[0m - - %(t)s \033[96m"%(request_line)s"\033[0m \033[93m%(s)s\033[0m %(B)s "%(f)s" "%(a)s" %(L)s'
8787
# noinspection PyTypeChecker

main.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from dotenv import load_dotenv
88

99
from explorer import Explorer
10-
from util.set_proc_title import set_proc_title
10+
from util.set_proc_title import set_proc_title, set_thread_title
1111

1212
nest_asyncio.apply()
1313
load_dotenv()
@@ -26,7 +26,8 @@ async def main():
2626
gen2 = gen2 * 5
2727
gc.set_threshold(allocs, gen1, gen2)
2828

29-
set_proc_title("aleo-explorer: main")
29+
set_proc_title("aleo-explorer")
30+
set_thread_title("aleo-explorer: main")
3031
decimal.getcontext().prec = 80
3132
e = Explorer()
3233
e.start()

util/set_proc_title.py

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11

22
# noinspection PyPackageRequirements
3+
def set_thread_title(name: str):
4+
try:
5+
import setproctitle
6+
except ImportError:
7+
return
8+
9+
setproctitle.setthreadtitle(name)
10+
11+
312
def set_proc_title(name: str):
413
try:
514
import setproctitle

webapi/webapi.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from middleware.auth import AuthMiddleware
1717
from middleware.server_timing import ServerTimingMiddleware
1818
from node.light_node import LightNodeState
19-
from util.set_proc_title import set_proc_title
19+
from util.set_proc_title import set_thread_title
2020
from .address_routes import address_route, ans_route
2121
from .chain_routes import blocks_route, get_summary, recent_blocks_route, index_update_route, block_route, search_route, \
2222
transaction_route, \
@@ -90,7 +90,7 @@ async def noop(_: Any): pass
9090
app.state.lns.connect(os.environ.get("P2P_NODE_HOST", "127.0.0.1"), int(os.environ.get("P2P_NODE_PORT", "4133")), None)
9191
app.state.lns.start_listener()
9292
app.state.session = aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=1))
93-
set_proc_title("aleo-explorer: webapi")
93+
set_thread_title("aleo-explorer: webapi")
9494

9595
log_format = '\033[92mWEB\033[0m: \033[94m%(client_addr)s\033[0m - - %(t)s \033[96m"%(request_line)s"\033[0m \033[93m%(s)s\033[0m %(B)s "%(f)s" "%(a)s" %(L)s'
9696
# noinspection PyTypeChecker

webui/webui.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from middleware.htmx import HtmxMiddleware
1313
from middleware.minify import MinifyMiddleware
1414
from middleware.server_timing import ServerTimingMiddleware
15-
from util.set_proc_title import set_proc_title
15+
from util.set_proc_title import set_thread_title
1616
from .chain_routes import *
1717
from .error_routes import *
1818
from .program_routes import *
@@ -168,7 +168,7 @@ async def noop(_: Any): pass
168168
# noinspection PyUnresolvedReferences
169169
app.state.db = db
170170
app.state.session = aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=1))
171-
set_proc_title("aleo-explorer: webui")
171+
set_thread_title("aleo-explorer: webui")
172172

173173
log_format = '\033[92mACCESS\033[0m: \033[94m%(client_addr)s\033[0m - - %(t)s \033[96m"%(request_line)s"\033[0m \033[93m%(s)s\033[0m %(B)s "%(f)s" "%(a)s" %(L)s \033[95m%(htmx)s\033[0m'
174174
# noinspection PyTypeChecker

0 commit comments

Comments
 (0)