From 4c10cb6667be72b2af9f8f44788b996a3251d405 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Sun, 12 Feb 2023 20:03:20 +0000 Subject: [PATCH] Update DB Strings --- .dockerignore | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++ .gitignore | 3 +- Dockerfile | 6 +- src/mongo.py | 5 +- src/test.py | 5 ++ 5 files changed, 182 insertions(+), 5 deletions(-) create mode 100644 src/test.py diff --git a/.dockerignore b/.dockerignore index e69de29..25dab36 100644 --- a/.dockerignore +++ b/.dockerignore @@ -0,0 +1,168 @@ +run.sh +*.md +Dockerfile +.dockerignore +.gitignore +LICENSE + +# ---> Python +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ \ No newline at end of file diff --git a/.gitignore b/.gitignore index de5e1bc..6d8efc6 100644 --- a/.gitignore +++ b/.gitignore @@ -160,5 +160,4 @@ cython_debug/ # be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore # and can be added to the global gitignore or merged into this file. For a more nuclear # option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ - +#.idea/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 3442691..ede9747 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1 +1,5 @@ -FROM python:3.11 \ No newline at end of file +FROM python:3.11-alpine +COPY ./requirements.txt /app/requirements.txt +RUN [ "pip", "install", "-r", "/app/requirements.txt" ] +COPY ./src /app/src +ENTRYPOINT [ "python", "/app/src/test.py" ] \ No newline at end of file diff --git a/src/mongo.py b/src/mongo.py index 2b910e0..4e4be45 100644 --- a/src/mongo.py +++ b/src/mongo.py @@ -11,19 +11,20 @@ db_user = urllib.parse.quote_plus(os.getenv('OWL_DB_USER', "owl")) db_pass = urllib.parse.quote_plus(os.getenv('OWL_DB_PASS', "twittwoo")) db_name = os.getenv('OWL_DB_NAME', "owlboard") +log.out(f"mongo.py: Connecting to database at {db_host}:{db_port}", "INFOm") client = MongoClient(f"mongodb://{db_user}:{db_pass}@{db_host}:{db_port}") db = client[db_name] def metaCheckTime(target): col = db["meta"] - res = col.find_one({"target": target}) + res = col.find_one({"target": target, "type": "collection"}) log.out(f'mongo.metaUpdateTime: {target} last updated at {res["updated"]}', "INFO") return res["updated"] def metaUpdateTime(target): col = db["meta"] log.out(f'mongo.metaUpdateTime: Updating updated time for {target}', "INFO") - res = col.update_one({"target": target}, {"$set":{"updated": int(time.time())}}, upsert=True) + res = col.update_one({"target": target, "type":"collection"}, {"$set":{"updated": int(time.time()),"target":target, "type":"collection"}}, upsert=True) def getLength(collection): col = db[collection] diff --git a/src/test.py b/src/test.py new file mode 100644 index 0000000..068fb47 --- /dev/null +++ b/src/test.py @@ -0,0 +1,5 @@ +import time + +while True: + print("Running...") + time.sleep(10) \ No newline at end of file