From 09c7d382b644d41b29cfd19d98db5e4900d73516 Mon Sep 17 00:00:00 2001
From: admire <admire@kartoza.com>
Date: Sun, 26 Jan 2020 09:15:22 +0200
Subject: [PATCH] Made changes

---
 docker-imposm3/Dockerfile   |  2 +-
 docker-imposm3/importer.py  | 13 +++++++++++--
 docker-osmenrich/Dockerfile |  4 ----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/docker-imposm3/Dockerfile b/docker-imposm3/Dockerfile
index dc10196..30286ab 100644
--- a/docker-imposm3/Dockerfile
+++ b/docker-imposm3/Dockerfile
@@ -6,7 +6,7 @@ RUN wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - |  apt-key a
 RUN sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'
 RUN apt update && apt install -y python3-pip \
       libprotobuf-dev libleveldb-dev libgeos-dev \
-      libpq-dev python3-dev postgresql-client-11 python-setuptools \
+      libpq-dev python3-dev postgresql-client-12 python-setuptools \
       gdal-bin \
       --no-install-recommends
 
diff --git a/docker-imposm3/importer.py b/docker-imposm3/importer.py
index dffd5e5..1a03b97 100644
--- a/docker-imposm3/importer.py
+++ b/docker-imposm3/importer.py
@@ -20,7 +20,7 @@
 """
 
 from sys import exit, stderr
-from os import environ, listdir
+from os import environ, listdir, path, mknod, remove
 from shutil import move
 from os.path import join, exists, abspath, isabs
 from psycopg2 import connect, OperationalError
@@ -253,7 +253,7 @@ class Importer(object):
         call(command)
 
     def perform_cron(self):
-        cron_sql = """ SELECT cron.schedule('*/59 * * * *', $$select clean_tables()$$); """
+        cron_sql = """ SELECT cron.schedule('*/20 * * * *', $$select clean_tables()$$); """
         self.cursor.execute(cron_sql)
 
     def locate_table(self, name):
@@ -273,6 +273,12 @@ class Importer(object):
 
         call(clipper, shell=True)
 
+    def create_lock_file(self):
+        importer_lockfile = path.join(self.default['SETTINGS'], '.importer.lock')
+        remove(importer_lockfile)
+        if not path.exists(importer_lockfile):
+            mknod(importer_lockfile)
+
     def run(self):
         """First checker."""
         osm_tables = self.locate_table('osm_%')
@@ -282,8 +288,11 @@ class Importer(object):
 
             if self.clip_json_file:
                 self._first_pbf_import(['-limitto', self.clip_json_file])
+                self.create_lock_file()
             else:
                 self._first_pbf_import([])
+                self.create_lock_file()
+
         else:
             self.info(
                 'The database is not empty. Let\'s import only diff files.')
diff --git a/docker-osmenrich/Dockerfile b/docker-osmenrich/Dockerfile
index 60d0950..43dd6a1 100644
--- a/docker-osmenrich/Dockerfile
+++ b/docker-osmenrich/Dockerfile
@@ -6,10 +6,6 @@ RUN pip3 install -r /home/requirements.txt
 
 ADD enrich.py /home/
 
-RUN if [ ! -f /home/check_tables.sql ]; then \
-    echo "SELECT EXISTS (SELECT 1 AS result from information_schema.tables where table_name like  'osm_%');" >> /home/check_tables.sql;\
-    fi;
-
 WORKDIR /home
 CMD ["python3", "-u", "/home/enrich.py"]