kamikazechaser
/
cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Patch up failed merge

This commit is contained in:
nolash 2021-04-25 13:52:03 +02:00
parent 3b1cc00c32
commit 965aeeacb9
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/cic-eth/cic_eth/runnable/daemons/tasker.py
View File

@ -128,6 +128,7 @@ if broker[:4] == 'file':
'data_folder_out': bq,
'data_folder_processed': bp,
},
'result_extended': True,
},
)
logg.warning('celery broker dirs queue i/o {} processed {}, will NOT be deleted on shutdown'.format(bq, bp))
@ -153,13 +154,6 @@ RPCConnection.register_constructor(ConnType.UNIX, EthUnixSignerConnection, 'sign
RPCConnection.register_constructor(ConnType.HTTP, EthHTTPSignerConnection, 'signer')
RPCConnection.register_constructor(ConnType.HTTP_SSL, EthHTTPSignerConnection, 'signer')
RPCConnection.register_location(config.get('ETH_PROVIDER'), chain_spec, 'default')
<<<<<<< HEAD
#RPCConnection.register_location(config.get('SIGNER_SOCKET_PATH'), chain_spec, 'signer', constructor=EthUnixSignerConnection)
RPCConnection.register_constructor(ConnType.UNIX, EthUnixSignerConnection, tag='signer')
RPCConnection.register_constructor(ConnType.HTTP, EthHTTPSignerConnection, tag='signer')
RPCConnection.register_constructor(ConnType.HTTP_SSL, EthHTTPSignerConnection, tag='signer')
=======
>>>>>>> origin/master
RPCConnection.register_location(config.get('SIGNER_SOCKET_PATH'), chain_spec, 'signer')
Otx.tracing = config.true('TASKS_TRACE_QUEUE_STATUS')