mirror of https://github.com/zulip/zulip.git
scripts: Help mypy resolve the psycopg2.connect overload.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
parent
4fb97576e9
commit
5d77d50423
|
@ -172,7 +172,8 @@ if options.nagios_check:
|
||||||
pg_args["user"] = options.nagios_user
|
pg_args["user"] = options.nagios_user
|
||||||
else:
|
else:
|
||||||
del pg_args["user"]
|
del pg_args["user"]
|
||||||
conn = psycopg2.connect(**pg_args)
|
# connection_factory=None lets mypy understand the return type
|
||||||
|
conn = psycopg2.connect(connection_factory=None, **pg_args)
|
||||||
cursor = conn.cursor()
|
cursor = conn.cursor()
|
||||||
cursor.execute("SELECT count(*) FROM fts_update_log")
|
cursor.execute("SELECT count(*) FROM fts_update_log")
|
||||||
num = cursor.fetchall()[0][0]
|
num = cursor.fetchall()[0][0]
|
||||||
|
@ -199,7 +200,8 @@ retries = 1
|
||||||
while True:
|
while True:
|
||||||
try:
|
try:
|
||||||
if conn is None:
|
if conn is None:
|
||||||
conn = psycopg2.connect(**pg_args)
|
# connection_factory=None lets mypy understand the return type
|
||||||
|
conn = psycopg2.connect(connection_factory=None, **pg_args)
|
||||||
cursor = conn.cursor()
|
cursor = conn.cursor()
|
||||||
retries = 30
|
retries = 30
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,8 @@ pg_args["dbname"] = settings.DATABASES["default"]["NAME"]
|
||||||
pg_args["sslmode"] = settings.DATABASES["default"]["OPTIONS"].get("sslmode")
|
pg_args["sslmode"] = settings.DATABASES["default"]["OPTIONS"].get("sslmode")
|
||||||
pg_args["connect_timeout"] = "600"
|
pg_args["connect_timeout"] = "600"
|
||||||
|
|
||||||
conn = psycopg2.connect(**pg_args)
|
# connection_factory=None lets mypy understand the return type
|
||||||
|
conn = psycopg2.connect(connection_factory=None, **pg_args)
|
||||||
conn.autocommit = True
|
conn.autocommit = True
|
||||||
|
|
||||||
pg_server_version = conn.server_version
|
pg_server_version = conn.server_version
|
||||||
|
|
Loading…
Reference in New Issue