Load setproctitle as runtime.

This commit is contained in:
Richard Kiss 2020-03-31 16:10:12 -07:00
parent a0437b5acb
commit 155d14aff9
11 changed files with 22 additions and 16 deletions

View File

@ -1,11 +1,5 @@
from setuptools import setup from setuptools import setup
SETPROCTITLE_GITHUB = (
"setproctitle @ "
"https://github.com/Chia-Network/py-setproctitle/tarball/"
"d2ed86c5080bb645d8f6b782a4a86706c860d9e6#egg=setproctitle-50.0.0"
)
CLVM_TOOLS_GITHUB = ( CLVM_TOOLS_GITHUB = (
"clvm-tools @ " "clvm-tools @ "
"https://github.com/Chia-Network/clvm_tools/tarball/6ff53bcfeb0c970647b6cfdde360d32b316b1326#egg=clvm-tools" "https://github.com/Chia-Network/clvm_tools/tarball/6ff53bcfeb0c970647b6cfdde360d32b316b1326#egg=clvm-tools"
@ -26,7 +20,6 @@ dependencies = [
"chiapos==0.12.3", # proof of space "chiapos==0.12.3", # proof of space
"sortedcontainers==2.1.0", # For maintaining sorted mempools "sortedcontainers==2.1.0", # For maintaining sorted mempools
"websockets==8.1.0", # For use in wallet RPC and electron UI "websockets==8.1.0", # For use in wallet RPC and electron UI
SETPROCTITLE_GITHUB, # custom internal version of setproctitle, this should go away
CLVM_TOOLS_GITHUB, # clvm compiler tools CLVM_TOOLS_GITHUB, # clvm compiler tools
] ]

View File

@ -13,7 +13,7 @@ from src.server.server import ChiaServer
from src.types.peer_info import PeerInfo from src.types.peer_info import PeerInfo
from src.util.logging import initialize_logging from src.util.logging import initialize_logging
from src.util.config import load_config, load_config_cli from src.util.config import load_config, load_config_cli
from setproctitle import setproctitle from src.util.setproctitle import setproctitle
async def main(): async def main():

View File

@ -25,7 +25,7 @@ from src.full_node.coin_store import CoinStore
from src.util.logging import initialize_logging from src.util.logging import initialize_logging
from src.util.config import load_config_cli from src.util.config import load_config_cli
from src.util.pip_import import pip_import from src.util.pip_import import pip_import
from setproctitle import setproctitle from src.util.setproctitle import setproctitle
async def main(): async def main():

View File

@ -13,7 +13,7 @@ from src.server.server import ChiaServer
from src.types.peer_info import PeerInfo from src.types.peer_info import PeerInfo
from src.util.logging import initialize_logging from src.util.logging import initialize_logging
from src.util.config import load_config, load_config_cli from src.util.config import load_config, load_config_cli
from setproctitle import setproctitle from src.util.setproctitle import setproctitle
async def main(): async def main():

View File

@ -12,7 +12,7 @@ from src.server.outbound_message import NodeType
from src.server.server import ChiaServer from src.server.server import ChiaServer
from src.util.logging import initialize_logging from src.util.logging import initialize_logging
from src.util.config import load_config_cli from src.util.config import load_config_cli
from setproctitle import setproctitle from src.util.setproctitle import setproctitle
async def main(): async def main():

View File

@ -16,7 +16,7 @@ from src.timelord import Timelord
from src.types.peer_info import PeerInfo from src.types.peer_info import PeerInfo
from src.util.logging import initialize_logging from src.util.logging import initialize_logging
from src.util.config import load_config_cli from src.util.config import load_config_cli
from setproctitle import setproctitle from src.util.setproctitle import setproctitle
async def main(): async def main():

View File

@ -22,7 +22,7 @@ from src.types.full_block import FullBlock
from src.full_node.coin_store import CoinStore from src.full_node.coin_store import CoinStore
from src.util.logging import initialize_logging from src.util.logging import initialize_logging
from src.util.config import load_config_cli from src.util.config import load_config_cli
from setproctitle import setproctitle from src.util.setproctitle import setproctitle
async def main(): async def main():

View File

@ -7,7 +7,7 @@ from src.util.logging import initialize_logging
from src.util.config import load_config from src.util.config import load_config
from asyncio import Lock from asyncio import Lock
from typing import List from typing import List
from setproctitle import setproctitle from src.util.setproctitle import setproctitle
config = load_config("config.yaml", "timelord_launcher") config = load_config("config.yaml", "timelord_launcher")

13
src/util/setproctitle.py Normal file
View File

@ -0,0 +1,13 @@
from .pip_import import pip_import
SETPROCTITLE_GITHUB = (
"setproctitle @ "
"https://github.com/Chia-Network/py-setproctitle/tarball/"
"d2ed86c5080bb645d8f6b782a4a86706c860d9e6#egg=setproctitle-50.0.0"
)
def setproctitle(ps_name):
pysetproctitle = pip_import("setproctitle", SETPROCTITLE_GITHUB)
pysetproctitle.setproctitle(ps_name)

View File

@ -29,7 +29,7 @@ from src.wallet.util.wallet_types import WalletType
from src.wallet.wallet_info import WalletInfo from src.wallet.wallet_info import WalletInfo
from src.wallet.wallet_node import WalletNode from src.wallet.wallet_node import WalletNode
from src.types.mempool_inclusion_status import MempoolInclusionStatus from src.types.mempool_inclusion_status import MempoolInclusionStatus
from setproctitle import setproctitle from src.util.setproctitle import setproctitle
# Timeout for response from wallet/full node for sending a transaction # Timeout for response from wallet/full node for sending a transaction
TIMEOUT = 5 TIMEOUT = 5

View File

@ -1,5 +1,5 @@
import unittest import unittest
from setproctitle import setproctitle from src.util.setproctitle import setproctitle
class TestSetProcTitle(unittest.TestCase): class TestSetProcTitle(unittest.TestCase):