jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(connector): handle db connection drop (#1223)

Browse source 
* Added compatibility with SaaS, added reboot of connection if connection droped

* Small fix
This commit is contained in:
MauricioGarciaS 2023-05-02 16:31:20 +02:00 • committed by GitHub
parent 8473426f81
commit 298288301a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ee/connectors/consumer_async.py
View file

@ -127,8 +127,12 @@ def attempt_batch_insert(batch, db, table_name, EVENT_TYPE, try_=0):
try_ += 1
sleep(try_*2)
attempt_batch_insert(batch, db, table_name, EVENT_TYPE, try_)
else:
elif try_ == 3:
# TODO: Restart redshift
db.restart()
sleep(2)
attempt_batch_insert(batch, db, table_name, EVENT_TYPE, try_ + 1)
else:
print(repr(e))
except Exception as e:
print(repr(e))

23
ee/connectors/utils/pg_client.py
View file

@ -10,12 +10,33 @@ from psycopg2 import pool
logging.basicConfig(level=config("LOGLEVEL", default=logging.INFO))
logging.getLogger('apscheduler').setLevel(config("LOGLEVEL", default=logging.INFO))
_PG_CONFIG = {"host": config("pg_host"),
conn_str = config('string_connection', default='')
if conn_str == '':
_PG_CONFIG = {"host": config("pg_host"),
"database": config("pg_dbname"),
"user": config("pg_user"),
"password": config("pg_password"),
"port": config("pg_port", cast=int),
"application_name": config("APP_NAME", default="PY")}
else:
usr_info, host_info = conn_str.split('@')
i = usr_info.find('://')
pg_user, pg_password = usr_info[i+3:].split(':')
host_info, pg_dbname = host_info.split('/')
i = host_info.find(':')
if i == -1:
pg_host = host_info
pg_port = 5432
else:
pg_host, pg_port = host_info.split(':')
pg_port = int(pg_port)
_PG_CONFIG = {"host": pg_host,
"database": pg_dbname,
"user": pg_user,
"password": pg_password,
"port": pg_port,
"application_name": config("APP_NAME", default="PY")}
PG_CONFIG = dict(_PG_CONFIG)
if config("PG_TIMEOUT", cast=int, default=0) > 0:
PG_CONFIG["options"] = f"-c statement_timeout={config('PG_TIMEOUT', cast=int) * 1000}"