diff --git a/data/apps/__DEPRECATED__/cvttcomm.cfg b/data/apps/__DEPRECATED__/cvttcomm.cfg index 11489c9..010ccb2 100644 --- a/data/apps/__DEPRECATED__/cvttcomm.cfg +++ b/data/apps/__DEPRECATED__/cvttcomm.cfg @@ -1,11 +1,11 @@ { "type": "redis", - "redis_settings": "localhost" + "comm_settings": "/comm/pubsub/redis/localhost" , "app_channels": { "executor": "EXEC" - , "risk_manager": "RMGR" + , "risk_manager": "RMGR" , "trader": "TRDR" - , "quant": "QUANT" + , "quant": "QUANT" } } diff --git a/data/apps/__DEPRECATED__/executor_app.cfg b/data/apps/__DEPRECATED__/executor_app.cfg index fad3101..f7cade9 100644 --- a/data/apps/__DEPRECATED__/executor_app.cfg +++ b/data/apps/__DEPRECATED__/executor_app.cfg @@ -1,7 +1,7 @@ +@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { - "refdata": @inc=http://cloud11.cvtt.vpn:6789/refdata/refdata - , "redis": @inc=http://cloud11.cvtt.vpn:6789/apps/common/redis - , "cvttcomm": @inc=http://cloud11.cvtt.vpn:6789/apps/cvttcomm + "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm , "exchanges_settings": { "COINBASE_AT": { "order_entry": { diff --git a/data/apps/__DEPRECATED__/quant_app.cfg b/data/apps/__DEPRECATED__/quant_app.cfg index 7bb62b2..3edc1bb 100644 --- a/data/apps/__DEPRECATED__/quant_app.cfg +++ b/data/apps/__DEPRECATED__/quant_app.cfg @@ -2,8 +2,7 @@ { "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis - , "cvttcomm": @inc=http://${CONFIG_SERVICE}/apps/cvttcomm + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm , "quant": { "books": { "CVTT_BK01": {} diff --git a/data/apps/__DEPRECATED__/risk_manager_app.cfg b/data/apps/__DEPRECATED__/risk_manager_app.cfg index a52e154..7c9c665 100644 --- a/data/apps/__DEPRECATED__/risk_manager_app.cfg +++ b/data/apps/__DEPRECATED__/risk_manager_app.cfg @@ -1,9 +1,7 @@ - +@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { - - "refdata": @inc=http://cloud11.cvtt.vpn:6789/refdata/refdata - , "cvttcomm": @inc=http://cloud11.cvtt.vpn:6789/apps/cvttcomm - , "redis": @inc=http://cloud11.cvtt.vpn:6789/apps/common/redis + "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm , "risk_manager": { "book": "CVTT_BK01" , "database": { diff --git a/data/apps/__DEPRECATED__/trader_app.cfg b/data/apps/__DEPRECATED__/trader_app.cfg index 906b876..cd6d6f8 100644 --- a/data/apps/__DEPRECATED__/trader_app.cfg +++ b/data/apps/__DEPRECATED__/trader_app.cfg @@ -1,7 +1,7 @@ +@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { - "refdata": @inc=http://cloud11.cvtt.vpn:6789/refdata/refdata - , "cvttcomm": @inc=http://cloud11.cvtt.vpn:6789/apps/cvttcomm - , "redis": @inc=http://cloud11.cvtt.vpn:6789/apps/common/redis + "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm , "exchanges_settings": { "COINBASE_AT": { "mkt_data": { diff --git a/data/apps/active_instruments.cfg b/data/apps/active_instruments.cfg index ad10bfc..014bfdb 100644 --- a/data/apps/active_instruments.cfg +++ b/data/apps/active_instruments.cfg @@ -3,7 +3,7 @@ "dynamic_stock_list": { "exchange_id": "ALPACA" , "list_source": "redis" - , "redis_settings": "cvtt-prod-eqty-01" + , "comm_settings": "/comm/pubsub/redis/cvtt-prod-eqty-01" , "redis_key": "DAY_STOCK_LIST" } } diff --git a/data/apps/algo_trade.cfg b/data/apps/algo_trade.cfg index c5573d1..9b109b1 100644 --- a/data/apps/algo_trade.cfg +++ b/data/apps/algo_trade.cfg @@ -3,7 +3,7 @@ @var SourcePath=/home/oleg/develop/cvtt2/tmp { "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm , "algos": @inc=http://${CONFIG_SERVICE}/apps/common/algos , "session_type": "CALENDAR" diff --git a/data/apps/common/comm.cfg b/data/apps/common/comm.cfg index 1245b67..87406b3 100644 --- a/data/apps/common/comm.cfg +++ b/data/apps/common/comm.cfg @@ -1,35 +1,43 @@ -# INTENDED TO REPLACE redis.cfg +# /comm { - "redis": { - "localhost": { - "url": "redis://localhost" - , "read_timeout" : 0.01 - , "ping_timeout_secs": 2.0 - } - , "cvttdata": { - "url": "redis://cvttdata.cvtt.vpn" - , "read_timeout" : 0.01 - , "ping_timeout_secs": 2.0 - } - , "cvtt-testserver": { - "url": "redis://cvtt-testserver.cvtt.vpn" - , "read_timeout" : 0.01 - , "ping_timeout_secs": 2.0 - } - , "cvtt-prod-eqty-01": { - "url": "redis://cvtt-prod-eqty-01.cvtt.vpn" - , "read_timeout" : 0.01 - , "ping_timeout_secs": 2.0 - } - , "cvtt-prod-03": { - "url": "redis://cvtt-prod-03.cvtt.vpn" - , "read_timeout" : 0.01 - , "ping_timeout_secs": 2.0 - } - , "cvtt-prod-eqty-01": { - "url": "redis://cvtt-prod-eqty-01.cvtt.vpn" - , "read_timeout" : 0.01 - , "ping_timeout_secs": 2.0 + "pubsub" : { + "redis": { + "localhost": { + "url": "redis://localhost" + , "type": "redis" + , "read_timeout" : 0.01 + , "ping_timeout_secs": 2.0 + } + , "cvttdata": { + "url": "redis://cvttdata.cvtt.vpn" + , "type": "redis" + , "read_timeout" : 0.01 + , "ping_timeout_secs": 2.0 + } + , "cvtt-testserver": { + "url": "redis://cvtt-testserver.cvtt.vpn" + , "type": "redis" + , "read_timeout" : 0.01 + , "ping_timeout_secs": 2.0 + } + , "cvtt-prod-eqty-01": { + "url": "redis://cvtt-prod-eqty-01.cvtt.vpn" + , "type": "redis" + , "read_timeout" : 0.01 + , "ping_timeout_secs": 2.0 + } + , "cvtt-prod-03": { + "url": "redis://cvtt-prod-03.cvtt.vpn" + , "type": "redis" + , "read_timeout" : 0.01 + , "ping_timeout_secs": 2.0 + } + , "cvtt-prod-eqty-01": { + "url": "redis://cvtt-prod-eqty-01.cvtt.vpn" + , "type": "redis" + , "read_timeout" : 0.01 + , "ping_timeout_secs": 2.0 + } } } } \ No newline at end of file diff --git a/data/apps/common/redis.cfg b/data/apps/common/redis.cfg deleted file mode 100644 index 92c1cec..0000000 --- a/data/apps/common/redis.cfg +++ /dev/null @@ -1,32 +0,0 @@ -{ - "localhost": { - "url": "redis://localhost" - , "read_timeout" : 0.01 - , "ping_timeout_secs": 2.0 - } - , "cvttdata": { - "url": "redis://cvttdata.cvtt.vpn" - , "read_timeout" : 0.01 - , "ping_timeout_secs": 2.0 - } - , "cvtt-testserver": { - "url": "redis://cvtt-testserver.cvtt.vpn" - , "read_timeout" : 0.01 - , "ping_timeout_secs": 2.0 - } - , "cvtt-prod-eqty-01": { - "url": "redis://cvtt-prod-eqty-01.cvtt.vpn" - , "read_timeout" : 0.01 - , "ping_timeout_secs": 2.0 - } - , "cvtt-prod-03": { - "url": "redis://cvtt-prod-03.cvtt.vpn" - , "read_timeout" : 0.01 - , "ping_timeout_secs": 2.0 - } - , "cvtt-prod-eqty-01": { - "url": "redis://cvtt-prod-eqty-01.cvtt.vpn" - , "read_timeout" : 0.01 - , "ping_timeout_secs": 2.0 - } -} diff --git a/data/apps/cvtt.cfg b/data/apps/cvtt.cfg index c59f1c4..1c46dd1 100644 --- a/data/apps/cvtt.cfg +++ b/data/apps/cvtt.cfg @@ -3,12 +3,13 @@ { "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis - , "cvttcomm": { - "type": "redis" - # , "redis_settings": "localhost" - , "redis_settings": "cloud17" - } + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm + , "comm_settings": "/comm/pubsub/redis/cloud17" + # , "cvttcomm": { + # "type": "redis" + # # , "comm_settings": "/comm/pubsub/redis/localhost" + # , "comm_settings": "/comm/pubsub/redis/cloud17" + # } , "session_type": "PERMANENT" , "books": { "CVTT_BK01": {} diff --git a/data/apps/cvtt_crypto_coinbs.cfg b/data/apps/cvtt_crypto_coinbs.cfg index 6078398..5bce529 100644 --- a/data/apps/cvtt_crypto_coinbs.cfg +++ b/data/apps/cvtt_crypto_coinbs.cfg @@ -3,12 +3,11 @@ { "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis - , "cvttcomm": { - "type": "redis" - # , "redis_settings": "localhost" - , "redis_settings": "cloud17" - } + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm + , "comm_settings": "/comm/pubsub/redis/cloud17" + # , "cvttcomm": { + # "type": "redis" + # } , "session_type": "PERMANENT" , "books": { "CVTT_BK01": {} diff --git a/data/apps/cvtt_eqt_alpaca.cfg b/data/apps/cvtt_eqt_alpaca.cfg index 6311db9..8e30a99 100644 --- a/data/apps/cvtt_eqt_alpaca.cfg +++ b/data/apps/cvtt_eqt_alpaca.cfg @@ -3,12 +3,9 @@ { "___dummy___": null , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm , "active_instruments": @inc=http://${CONFIG_SERVICE}/apps/active_instruments - , "cvttcomm": { - "type": "redis" - , "redis_settings": "cvtt-prod-eqty-01" - } + , "comm_settings": "/comm/pubsub/redis/cvtt-prod-eqty-01" , "session_type": "CALENDAR" , "calendar_session": { "trading_hours_url": [ diff --git a/data/apps/md_portal.cfg b/data/apps/md_portal.cfg index e3953c8..3fb12d6 100644 --- a/data/apps/md_portal.cfg +++ b/data/apps/md_portal.cfg @@ -3,5 +3,5 @@ { # ---------------------------------- "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm } diff --git a/data/apps/md_recorder.cfg b/data/apps/md_recorder.cfg index c42782a..c77a787 100644 --- a/data/apps/md_recorder.cfg +++ b/data/apps/md_recorder.cfg @@ -2,15 +2,16 @@ { "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm // ------------------------------------------------------------------------- // This is used only for dynamically loaded instrument lists (as for Alpaca) , "active_instruments": @inc=http://${CONFIG_SERVICE}/apps/active_instruments - , "cvttcomm": { - "type": "redis" - , "redis_settings": "cvtt-prod-eqty-01" - } + , "comm_settings": "/comm/pubsub/redis/cvtt-prod-eqty-01" + # , "cvttcomm": { + # "type": "redis" + # , "comm_settings": "/comm/pubsub/redis/cvtt-prod-eqty-01" + # } //------------------------------------------------------------------------------ , "md_recorder": { diff --git a/data/apps/minimal_md.cfg b/data/apps/minimal_md.cfg index a4e36ea..e987d70 100644 --- a/data/apps/minimal_md.cfg +++ b/data/apps/minimal_md.cfg @@ -9,9 +9,10 @@ }, } } - , "cvttcomm": { - "type": "redis" - , "redis_settings": "localhost" - } + , "comm_settings": "/comm/pubsub/redis/localhost" + # , "cvttcomm": { + # "type": "redis" + # , "comm_settings": "/comm/pubsub/redis/localhost" + # } } diff --git a/data/apps/minimal_md_eqt.cfg b/data/apps/minimal_md_eqt.cfg index 8bdc6e7..d37fdd2 100644 --- a/data/apps/minimal_md_eqt.cfg +++ b/data/apps/minimal_md_eqt.cfg @@ -15,9 +15,10 @@ }, } } - , "cvttcomm": { - "type": "redis" - , "redis_settings": "localhost" - } + , "comm_settings": "/comm/pubsub/redis/localhost" + # , "cvttcomm": { + # "type": "redis" + # , "comm_settings": "/comm/pubsub/redis/localhost" + # } } diff --git a/data/apps/research/mkt_simulator.cfg b/data/apps/research/mkt_simulator.cfg index 7c63d9f..61eeb70 100644 --- a/data/apps/research/mkt_simulator.cfg +++ b/data/apps/research/mkt_simulator.cfg @@ -7,9 +7,9 @@ { "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm - , "redis_settings": "localhost" + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm + , "comm_settings": "/comm/pubsub/redis/localhost" , "simulation": { # "speed_factor": 1.0, "speed_factor": 0.0, diff --git a/data/apps/tests/get_positions.cfg b/data/apps/tests/get_positions.cfg index a2f3830..42363c2 100644 --- a/data/apps/tests/get_positions.cfg +++ b/data/apps/tests/get_positions.cfg @@ -32,6 +32,6 @@ } } , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm } diff --git a/data/apps/tests/get_trades.cfg b/data/apps/tests/get_trades.cfg index cc0d3e1..0ae4a71 100644 --- a/data/apps/tests/get_trades.cfg +++ b/data/apps/tests/get_trades.cfg @@ -23,6 +23,6 @@ } } , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm } diff --git a/data/apps/tests/listen_market_data.cfg b/data/apps/tests/listen_market_data.cfg index 1e760f2..471fb15 100644 --- a/data/apps/tests/listen_market_data.cfg +++ b/data/apps/tests/listen_market_data.cfg @@ -1,7 +1,7 @@ @var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm , "active_instruments": @inc=http://${CONFIG_SERVICE}/apps/active_instruments "exchanges_settings": { "*": { @@ -19,7 +19,7 @@ } # , "cvttcomm": { # "type": "redis" - # , "redis_settings": "localhost" + # , "comm_settings": "/comm/pubsub/redis/localhost" # } } diff --git a/data/apps/tests/listen_market_data_prod.cfg b/data/apps/tests/listen_market_data_prod.cfg index 4c98156..ffcc4a7 100644 --- a/data/apps/tests/listen_market_data_prod.cfg +++ b/data/apps/tests/listen_market_data_prod.cfg @@ -1,7 +1,7 @@ @var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm , "active_instruments": @inc=http://${CONFIG_SERVICE}/apps/active_instruments , "exchanges_settings": { "*": { @@ -11,10 +11,11 @@ }, } } - , "cvttcomm": { - "type": "redis" - , "redis_settings": "cvtt-prod-eqty-01" - } + , "comm_settings": "/comm/pubsub/redis/cvtt-prod-eqty-01" + # , "cvttcomm": { + # "type": "redis" + # , "comm_settings": "/comm/pubsub/redis/cvtt-prod-eqty-01" + # } , "md_portal": { "app_channel": "MD_PORTAL" } diff --git a/data/apps/tests/send_order_cvtt.cfg b/data/apps/tests/send_order_cvtt.cfg index de8ad8c..6047d93 100644 --- a/data/apps/tests/send_order_cvtt.cfg +++ b/data/apps/tests/send_order_cvtt.cfg @@ -1,13 +1,14 @@ @var CONFIG_SERVICE=cloud23.cvtt.vpn:6789 { "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata - , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis + , "comm": @inc=http://${CONFIG_SERVICE}/apps/common/comm - , "cvttcomm": { - "type": "redis" - # , "redis_settings": "localhost" - , "redis_settings": "cvtt-prod" - } + , "comm_settings": "/comm/pubsub/redis/cvtt-prod" + # , "cvttcomm": { + # "type": "redis" + # # , "comm_settings": "/comm/pubsub/redis/localhost" + # , "comm_settings": "/comm/pubsub/redis/cvtt-prod" + # } , "executor": { "app_channel": "EXEC" } diff --git a/data/refdata/exchanges.cfg b/data/refdata/exchanges.cfg index 2cd7b21..0682d7f 100644 --- a/data/refdata/exchanges.cfg +++ b/data/refdata/exchanges.cfg @@ -435,7 +435,7 @@ , "mktdata" : { "class": "cvttpy.exchanges.proxies.md_portal_clnt.mkt_data.MktDataPortalFeed" - , "redis_settings": "cvtt-prod-eqty-01" + , "comm_settings": "/comm/pubsub/redis/cvtt-prod-eqty-01" , "channel_prefix": "MD_ALPACA_SNDBX" } } @@ -446,7 +446,7 @@ , "mktdata" : { "class": "cvttpy.exchanges.proxies.md_portal_clnt.mkt_data.MktDataPortalFeed" - , "redis_settings": "cvtt-prod-03" + , "comm_settings": "/comm/pubsub/redis/cvtt-prod-03" , "channel_prefix": "MD_ALPACA_03" } }