Improvements for psql wait script.

* support: Move to shared directory to avoid code drift. * feat: Make DB name configurable
odoo · Mar 31, 2024 · c446a5b · c446a5b
1 parent 0daa6ed
commit c446a5b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/15.0/wait-for-psql.py b/15.0/wait-for-psql.py
@@ -10,21 +10,24 @@
     arg_parser.add_argument('--db_host', required=True)
     arg_parser.add_argument('--db_port', 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('--timeout', type=int, default=5)
 
     args = arg_parser.parse_args()
 
+    conn = None
     start_time = time.time()
+    error = ''
+
     while (time.time() - start_time) < args.timeout:
         try:
-            conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres')
-            error = ''
+            conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname=args.db_name)
+            conn.close()
             break
         except psycopg2.OperationalError as e:
             error = e
-        else:
-            conn.close()
+
         time.sleep(1)
 
     if error:

diff --git a/16.0/Dockerfile b/16.0/Dockerfile
@@ -93,7 +93,7 @@ EXPOSE 8069 8071 8072
 # Set the default config file
 ENV ODOO_RC /etc/odoo/odoo.conf
 
-COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py
+COPY ../shared/wait-for-psql.py /usr/local/bin/wait-for-psql.py
 
 # Set default user when running the container
 USER odoo

diff --git a/16.0/wait-for-psql.py b/16.0/wait-for-psql.py
@@ -10,21 +10,24 @@
     arg_parser.add_argument('--db_host', required=True)
     arg_parser.add_argument('--db_port', 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('--timeout', type=int, default=5)
 
     args = arg_parser.parse_args()
 
+    conn = None
     start_time = time.time()
+    error = ''
+
     while (time.time() - start_time) < args.timeout:
         try:
-            conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres')
-            error = ''
+            conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname=args.db_name)
+            conn.close()
             break
         except psycopg2.OperationalError as e:
             error = e
-        else:
-            conn.close()
+
         time.sleep(1)
 
     if error:

diff --git a/17.0/wait-for-psql.py b/17.0/wait-for-psql.py
@@ -10,21 +10,24 @@
     arg_parser.add_argument('--db_host', required=True)
     arg_parser.add_argument('--db_port', 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('--timeout', type=int, default=5)
 
     args = arg_parser.parse_args()
 
+    conn = None
     start_time = time.time()
+    error = ''
+
     while (time.time() - start_time) < args.timeout:
         try:
-            conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname='postgres')
-            error = ''
+            conn = psycopg2.connect(user=args.db_user, host=args.db_host, port=args.db_port, password=args.db_password, dbname=args.db_name)
+            conn.close()
             break
         except psycopg2.OperationalError as e:
             error = e
-        else:
-            conn.close()
+
         time.sleep(1)
 
     if error: