From 31268c0b476c5be9ba6ce5385f01ea5f8ab14835 Mon Sep 17 00:00:00 2001 From: nolash Date: Thu, 30 Sep 2021 08:50:01 +0200 Subject: [PATCH] Add config for extended results for task graph generator --- apps/cic-eth/cic_eth/runnable/daemons/tasker.py | 3 +++ apps/cic-eth/crypto_dev_signer_config/config.ini | 4 ---- apps/cic-eth/crypto_dev_signer_config/database.ini | 8 -------- apps/data-seeding/cic_eth/paths.py | 3 ++- 4 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 apps/cic-eth/crypto_dev_signer_config/config.ini delete mode 100644 apps/cic-eth/crypto_dev_signer_config/database.ini diff --git a/apps/cic-eth/cic_eth/runnable/daemons/tasker.py b/apps/cic-eth/cic_eth/runnable/daemons/tasker.py index 52e8e1d9..3a85e679 100644 --- a/apps/cic-eth/cic_eth/runnable/daemons/tasker.py +++ b/apps/cic-eth/cic_eth/runnable/daemons/tasker.py @@ -203,6 +203,9 @@ def main(): argv.append(config.get('CELERY_QUEUE')) argv.append('-n') argv.append(config.get('CELERY_QUEUE')) + argv.append('--config') + argv.append('celeryconfig') + BaseTask.default_token_symbol = config.get('CIC_DEFAULT_TOKEN_SYMBOL') BaseTask.default_token_address = registry.by_name(BaseTask.default_token_symbol) diff --git a/apps/cic-eth/crypto_dev_signer_config/config.ini b/apps/cic-eth/crypto_dev_signer_config/config.ini deleted file mode 100644 index c88377ab..00000000 --- a/apps/cic-eth/crypto_dev_signer_config/config.ini +++ /dev/null @@ -1,4 +0,0 @@ -[signer] -secret = deadbeef -#database = crypto-dev-signer -socket_path = ipc:///run/crypto-dev-signer/jsonrpc.ipc diff --git a/apps/cic-eth/crypto_dev_signer_config/database.ini b/apps/cic-eth/crypto_dev_signer_config/database.ini deleted file mode 100644 index 5eec2537..00000000 --- a/apps/cic-eth/crypto_dev_signer_config/database.ini +++ /dev/null @@ -1,8 +0,0 @@ -[database] -NAME=cic-signer -USER= -PASSWORD= -HOST= -PORT= -ENGINE= -DRIVER= diff --git a/apps/data-seeding/cic_eth/paths.py b/apps/data-seeding/cic_eth/paths.py index 7de81f7c..cfda53a1 100644 --- a/apps/data-seeding/cic_eth/paths.py +++ b/apps/data-seeding/cic_eth/paths.py @@ -7,6 +7,7 @@ import json # external imports import celery import confini +import celery.utils.graph # local imports from cic_eth.api import Api @@ -35,7 +36,7 @@ class Fmtr(celery.utils.graph.GraphFormatter): def main(): api = Api( - config.get('CIC_CHAIN_SPEC'), + config.get('CHAIN_SPEC'), queue='cic-eth', #callback_param='{}:{}:{}:{}'.format(args.redis_host_callback, args.redis_port_callback, redis_db, redis_channel), #callback_task='cic_eth.callbacks.redis.redis',