more gracefull wait for pg

osm-without-borders · Oct 25, 2018 · f0ffba4 · f0ffba4
1 parent 17efdc3
commit f0ffba4
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 56 deletions.
diff --git a/importer/Pipfile b/importer/Pipfile
@@ -12,10 +12,13 @@ ijson = "*"
 simplejson = "*"
 cffi = "*"
 fire = "*"
+retrying = "*"
+
 
 [requires]
 
 python_version = "3.6"
 
+
 [dev-packages]
 
diff --git a/importer/Pipfile.lock b/importer/Pipfile.lock
diff --git a/importer/import.py b/importer/import.py
@@ -6,8 +6,11 @@
 import ijson.backends.yajl2_cffi as ijson
 import simplejson as json
 import fire
+from retrying import retry
 
 
+# we wait a bit for postgres to be ready since if used with docker, so docker might take a while to start
+@retry(stop_max_delay=10000, retry_on_exception=psycopg2.OperationalError)
 def _pg_connect():
     dbname = environ.get('POSTGRES_DB')
     user = environ.get('POSTGRES_USER')

diff --git a/tasks.py b/tasks.py
@@ -15,7 +15,6 @@ def pop_stack(ctx, build_dockers=False):
     if build_dockers:
         ctx.run("docker-compose build --pull")
     ctx.run("docker-compose up -d")
-    ctx.run("sleep 5") # TODO do better to wait for pg
 
 def _run_container(ctx, container_name, job):
     main_docker_files = _get_docker_compose()