From 803aec96f09200fb8eacef58eba39c17d3249944 Mon Sep 17 00:00:00 2001 From: Devin Matte Date: Mon, 21 Dec 2020 13:47:25 -0500 Subject: [PATCH 1/4] Adding redis host config value --- config.py | 1 + 1 file changed, 1 insertion(+) diff --git a/config.py b/config.py index 6427076..a4a2223 100644 --- a/config.py +++ b/config.py @@ -53,6 +53,7 @@ SQLALCHEMY_DATABASE_URI = environ.get('PROXSTAR_SQLALCHEMY_DATABASE_URI', '') # REDIS REDIS_HOST = environ.get('PROXSTAR_REDIS_HOST', 'localhost') +RQ_DASHBOARD_REDIS_HOST = environ.get('PROXSTAR_REDIS_HOST', 'localhost') REDIS_PORT = int(environ.get('PROXSTAR_REDIS_PORT', '6379')) # VNC From d48a4cf90aded41b708e10252b71a10f247ed93a Mon Sep 17 00:00:00 2001 From: Devin Matte Date: Mon, 21 Dec 2020 14:17:48 -0500 Subject: [PATCH 2/4] Adding Redis Integration --- rqsettings.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rqsettings.py b/rqsettings.py index 1f0cc7f..e4714c7 100644 --- a/rqsettings.py +++ b/rqsettings.py @@ -2,14 +2,15 @@ import os import sentry_sdk from sentry_sdk.integrations.rq import RqIntegration +from sentry_sdk.integrations.redis import RedisIntegration -if os.path.exists('config_local.py'): +if os.path.exists("config_local.py"): import config_local as config else: import config sentry_sdk.init( config.SENTRY_DSN, - integrations=[RqIntegration()], - environment=config.SENTRY_ENV + integrations=[RqIntegration(), RedisIntegration()], + environment=config.SENTRY_ENV, ) From 2500567ee5db4821d91f5d83e98d79b3e7034e48 Mon Sep 17 00:00:00 2001 From: Devin Matte Date: Mon, 21 Dec 2020 14:25:53 -0500 Subject: [PATCH 3/4] Upping default timeout to 360 from 180 --- proxstar/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxstar/__init__.py b/proxstar/__init__.py index 7df895d..1ff7818 100644 --- a/proxstar/__init__.py +++ b/proxstar/__init__.py @@ -59,7 +59,7 @@ ssh_tunnels = [] auth = get_auth(app) redis_conn = Redis(app.config['REDIS_HOST'], app.config['REDIS_PORT']) -q = Queue(connection=redis_conn) +q = Queue(connection=redis_conn, default_timeout=360) scheduler = Scheduler(connection=redis_conn) engine = create_engine(app.config['SQLALCHEMY_DATABASE_URI']) From 97ae3cbbddd3d957331d407e88072691a0e496db Mon Sep 17 00:00:00 2001 From: Devin Matte Date: Mon, 21 Dec 2020 14:54:13 -0500 Subject: [PATCH 4/4] Fixing comments --- rqsettings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rqsettings.py b/rqsettings.py index e4714c7..31786d8 100644 --- a/rqsettings.py +++ b/rqsettings.py @@ -4,7 +4,7 @@ import sentry_sdk from sentry_sdk.integrations.rq import RqIntegration from sentry_sdk.integrations.redis import RedisIntegration -if os.path.exists("config_local.py"): +if os.path.exists('config_local.py'): import config_local as config else: import config