Open-Harbor/docker-odoo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Improvements for psql wait script.

Browse Source 
* support: Move to shared directory to avoid code drift.
* feat: Make DB name configurable
This commit is contained in:
Josh Santos 2024-03-31 17:52:18 -04:00
parent 0daa6ed770
commit 5740583e38
No known key found for this signature in database
GPG Key ID: F40E8260EF912E41
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
15.0/wait-for-psql.py
View File

@ -10,21 +10,24 @@ if __name__ == '__main__':
arg_parser.add_argument('--db_host', required=True) arg_parser.add_argument('--db_host', required=True)
arg_parser.add_argument('--db_port', required=True) arg_parser.add_argument('--db_port', required=True)
arg_parser.add_argument('--db_user', required=True) arg_parser.add_argument('--db_user', required=True)
arg_parser.add_argument('--db_name', required=True)
arg_parser.add_argument('--db_password', required=True) arg_parser.add_argument('--db_password', required=True)
arg_parser.add_argument('--timeout', type=int, default=5) arg_parser.add_argument('--timeout', type=int, default=5)
args = arg_parser.parse_args() args = arg_parser.parse_args()
conn = None
start_time = time.time() start_time = time.time()
error = ''
while (time.time() - start_time) < args.timeout: while (time.time() - start_time) < args.timeout:
try: try:
conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname=args.db_name)
error = '' conn.close()
break break
except psycopg2.OperationalError as e: except psycopg2.OperationalError as e:
error = e error = e
else:
conn.close()
time.sleep(1) time.sleep(1)
if error: if error:

11
16.0/wait-for-psql.py
View File

@ -10,21 +10,24 @@ if __name__ == '__main__':
arg_parser.add_argument('--db_host', required=True) arg_parser.add_argument('--db_host', required=True)
arg_parser.add_argument('--db_port', required=True) arg_parser.add_argument('--db_port', required=True)
arg_parser.add_argument('--db_user', required=True) arg_parser.add_argument('--db_user', required=True)
arg_parser.add_argument('--db_name', required=True)
arg_parser.add_argument('--db_password', required=True) arg_parser.add_argument('--db_password', required=True)
arg_parser.add_argument('--timeout', type=int, default=5) arg_parser.add_argument('--timeout', type=int, default=5)
args = arg_parser.parse_args() args = arg_parser.parse_args()
conn = None
start_time = time.time() start_time = time.time()
error = ''
while (time.time() - start_time) < args.timeout: while (time.time() - start_time) < args.timeout:
try: try:
conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname=args.db_name)
error = '' conn.close()
break break
except psycopg2.OperationalError as e: except psycopg2.OperationalError as e:
error = e error = e
else:
conn.close()
time.sleep(1) time.sleep(1)
if error: if error:

11
17.0/wait-for-psql.py
View File

@ -10,21 +10,24 @@ if __name__ == '__main__':
arg_parser.add_argument('--db_host', required=True) arg_parser.add_argument('--db_host', required=True)
arg_parser.add_argument('--db_port', required=True) arg_parser.add_argument('--db_port', required=True)
arg_parser.add_argument('--db_user', required=True) arg_parser.add_argument('--db_user', required=True)
arg_parser.add_argument('--db_name', required=True)
arg_parser.add_argument('--db_password', required=True) arg_parser.add_argument('--db_password', required=True)
arg_parser.add_argument('--timeout', type=int, default=5) arg_parser.add_argument('--timeout', type=int, default=5)
args = arg_parser.parse_args() args = arg_parser.parse_args()
conn = None
start_time = time.time() start_time = time.time()
error = ''
while (time.time() - start_time) < args.timeout: while (time.time() - start_time) < args.timeout:
try: try:
conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres') conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname=args.db_name)
error = '' conn.close()
break break
except psycopg2.OperationalError as e: except psycopg2.OperationalError as e:
error = e error = e
else:
conn.close()
time.sleep(1) time.sleep(1)
if error: if error: