From 965aeeacb92cb1fb2cbcd331eff559958f69c4ad Mon Sep 17 00:00:00 2001 From: nolash Date: Sun, 25 Apr 2021 13:52:03 +0200 Subject: [PATCH] Patch up failed merge --- apps/cic-eth/cic_eth/runnable/daemons/tasker.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/apps/cic-eth/cic_eth/runnable/daemons/tasker.py b/apps/cic-eth/cic_eth/runnable/daemons/tasker.py index d6402ea6..4daeaf9e 100644 --- a/apps/cic-eth/cic_eth/runnable/daemons/tasker.py +++ b/apps/cic-eth/cic_eth/runnable/daemons/tasker.py @@ -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')