diff --git a/changelog.md b/changelog.md index ab6181f..bfa5dbd 100644 --- a/changelog.md +++ b/changelog.md @@ -6,6 +6,8 @@ Brief summary of what's in this release: - Added logic to change ownership of moved files off of root user - Removed logic that required connection to spectrack for dlu-watcher - updated logic for handling nested folders +- updated base image of DluWatcher container +- set install of requirements as 'progress-banner off' to address issue with installing Flask and using all threads in DluWatcher container ### Breaking changes diff --git a/data_management/DluWatcher b/data_management/DluWatcher index 4dfd2dc..fa8cada 100644 --- a/data_management/DluWatcher +++ b/data_management/DluWatcher @@ -1,8 +1,10 @@ -FROM python:3.10-slim +FROM python:3.10-slim-bullseye COPY requirements.txt ./ -RUN pip3 install --no-cache-dir -r requirements.txt +RUN pip3 install --progress-bar off --no-cache-dir -r requirements.txt +RUN pip3 install -U flask-cors + COPY ./lib/ ./lib COPY ./services/dlu_filesystem.py ./services/dlu_filesystem.py COPY ./services/dlu_package_inventory.py ./services/dlu_package_inventory.py @@ -12,4 +14,4 @@ COPY ./services/dlu_mongo.py ./services/dlu_mongo.py COPY ./model ./model COPY ./watch_files.py ./ -ENTRYPOINT ["python3", "watch_files.py"] \ No newline at end of file +ENTRYPOINT ["python3", "watch_files.py"] diff --git a/data_management/lib/mongo_connection.py b/data_management/lib/mongo_connection.py index d155c68..3a0b293 100644 --- a/data_management/lib/mongo_connection.py +++ b/data_management/lib/mongo_connection.py @@ -42,10 +42,11 @@ def get_mongo_connection(self): ) database = mongo_client[self.database] return database - except: + except Exception: logger.error( f"Can't connect to Mongo\nMake sure you have filled out the correct environment variables in the .env file" ) + logger.error(traceback.format_exc()) logger.error(self.host) os.sys.exit() diff --git a/data_management/rebuild.sh b/data_management/rebuild.sh index 69b787c..b230e4e 100644 --- a/data_management/rebuild.sh +++ b/data_management/rebuild.sh @@ -1,2 +1,2 @@ python3 setup.py install --user -docker build -t kingstonduo/data-management:1.7 . +docker build -t kingstonduo/data-management:1.8 . diff --git a/data_management/requirements.txt b/data_management/requirements.txt index 075f075..a468132 100644 --- a/data_management/requirements.txt +++ b/data_management/requirements.txt @@ -8,4 +8,4 @@ python_dotenv python-dateutil zarr-checksum pyyaml -gunicorn \ No newline at end of file +gunicorn