chaintool/chaind-eth
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable config override

Browse Source
This commit is contained in:
nolash 2021-07-19 14:02:31 +02:00
parent 930faef213
commit 19291b93ce
Signed by: lash
GPG Key ID: 21D2E7BB88C2A746
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chaind_eth/dispatch.py
View File

@ -4,6 +4,7 @@ import logging
# external imports # external imports
from chainlib.eth.address import to_checksum_address from chainlib.eth.address import to_checksum_address
from chainlib.eth.tx import unpack from chainlib.eth.tx import unpack
from chainlib.error import JSONRPCException
from chainqueue.enum import StatusBits from chainqueue.enum import StatusBits
from chainqueue.sql.query import count_tx from chainqueue.sql.query import count_tx
from hexathon import strip_0x from hexathon import strip_0x

4
chaind_eth/runnable/server.py
View File

@ -34,7 +34,7 @@ arg_flags = chainlib.eth.cli.argflag_std_read
argparser = chainlib.eth.cli.ArgumentParser(arg_flags) argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
argparser.add_argument('--data-dir', type=str, help='data directory') argparser.add_argument('--data-dir', type=str, help='data directory')
argparser.add_argument('--runtime-dir', type=str, help='runtime directory') argparser.add_argument('--runtime-dir', type=str, help='runtime directory')
argparser.add_argument('--session-id', type=str, help='runtime directory') argparser.add_argument('--session-id', dest='session_id', type=str, help='session identifier')
args = argparser.parse_args() args = argparser.parse_args()
extra_args = { extra_args = {
'runtime_dir': 'SESSION_RUNTIME_DIR', 'runtime_dir': 'SESSION_RUNTIME_DIR',
@ -42,7 +42,7 @@ extra_args = {
'session_id': 'SESSION_ID', 'session_id': 'SESSION_ID',
} }
#config = chainlib.eth.cli.Config.from_args(args, arg_flags, default_config_dir=config_dir, extend_base_config_dir=config_dir) #config = chainlib.eth.cli.Config.from_args(args, arg_flags, default_config_dir=config_dir, extend_base_config_dir=config_dir)
config = chainlib.eth.cli.Config.from_args(args, arg_flags, base_config_dir=config_dir) config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, base_config_dir=config_dir)
logg.debug('session id {} {}'.format(type(config.get('SESSION_ID')), config.get('SESSION_ID'))) logg.debug('session id {} {}'.format(type(config.get('SESSION_ID')), config.get('SESSION_ID')))
if config.get('SESSION_ID') == None: if config.get('SESSION_ID') == None: