Skip to content

Commit 5740583

Browse files
committed
Improvements for psql wait script.
* support: Move to shared directory to avoid code drift. * feat: Make DB name configurable
1 parent 0daa6ed commit 5740583

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

15.0/wait-for-psql.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,24 @@
1010
arg_parser.add_argument('--db_host', required=True)
1111
arg_parser.add_argument('--db_port', required=True)
1212
arg_parser.add_argument('--db_user', required=True)
13+
arg_parser.add_argument('--db_name', required=True)
1314
arg_parser.add_argument('--db_password', required=True)
1415
arg_parser.add_argument('--timeout', type=int, default=5)
1516

1617
args = arg_parser.parse_args()
1718

19+
conn = None
1820
start_time = time.time()
21+
error = ''
22+
1923
while (time.time() - start_time) < args.timeout:
2024
try:
21-
conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres')
22-
error = ''
25+
conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname=args.db_name)
26+
conn.close()
2327
break
2428
except psycopg2.OperationalError as e:
2529
error = e
26-
else:
27-
conn.close()
30+
2831
time.sleep(1)
2932

3033
if error:

16.0/wait-for-psql.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,24 @@
1010
arg_parser.add_argument('--db_host', required=True)
1111
arg_parser.add_argument('--db_port', required=True)
1212
arg_parser.add_argument('--db_user', required=True)
13+
arg_parser.add_argument('--db_name', required=True)
1314
arg_parser.add_argument('--db_password', required=True)
1415
arg_parser.add_argument('--timeout', type=int, default=5)
1516

1617
args = arg_parser.parse_args()
1718

19+
conn = None
1820
start_time = time.time()
21+
error = ''
22+
1923
while (time.time() - start_time) < args.timeout:
2024
try:
21-
conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres')
22-
error = ''
25+
conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname=args.db_name)
26+
conn.close()
2327
break
2428
except psycopg2.OperationalError as e:
2529
error = e
26-
else:
27-
conn.close()
30+
2831
time.sleep(1)
2932

3033
if error:

17.0/wait-for-psql.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,24 @@
1010
arg_parser.add_argument('--db_host', required=True)
1111
arg_parser.add_argument('--db_port', required=True)
1212
arg_parser.add_argument('--db_user', required=True)
13+
arg_parser.add_argument('--db_name', required=True)
1314
arg_parser.add_argument('--db_password', required=True)
1415
arg_parser.add_argument('--timeout', type=int, default=5)
1516

1617
args = arg_parser.parse_args()
1718

19+
conn = None
1820
start_time = time.time()
21+
error = ''
22+
1923
while (time.time() - start_time) < args.timeout:
2024
try:
21-
conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres')
22-
error = ''
25+
conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname=args.db_name)
26+
conn.close()
2327
break
2428
except psycopg2.OperationalError as e:
2529
error = e
26-
else:
27-
conn.close()
30+
2831
time.sleep(1)
2932

3033
if error:

0 commit comments

Comments
 (0)