From ef6074eaa9a7eb3c918ecf4fb6893c94873141f3 Mon Sep 17 00:00:00 2001 From: andis Date: Thu, 23 Feb 2023 22:06:49 +0100 Subject: [PATCH] add logging --- Dockerfile_search | 9 +++++++++ build_docker | 3 ++- searching/__init__.py | 3 +++ test_search.py | 9 ++++++--- 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 Dockerfile_search diff --git a/Dockerfile_search b/Dockerfile_search new file mode 100644 index 0000000..4755e48 --- /dev/null +++ b/Dockerfile_search @@ -0,0 +1,9 @@ +from python:3.8 +workdir /srv + +RUN pip3 install setuptools_scm +RUN pip3 install elasticsearch + +COPY searching ./searching +COPY test_search.py . +CMD python3 test_search.py \ No newline at end of file diff --git a/build_docker b/build_docker index ded159f..96fadc3 100644 --- a/build_docker +++ b/build_docker @@ -1,2 +1,3 @@ docker build -t docker.fet.at/andis_scrapy:0.1.2 . -docker build -t docker.fet.at/andis_index:0.1.2 -f Dockerfile_index . \ No newline at end of file +docker build -t docker.fet.at/andis_index:0.1.2 -f Dockerfile_index . +docker build -t docker.fet.at/andis_search:0.1.3 -f Dockerfile_search . \ No newline at end of file diff --git a/searching/__init__.py b/searching/__init__.py index e822821..3ebae2c 100644 --- a/searching/__init__.py +++ b/searching/__init__.py @@ -4,6 +4,7 @@ import os from elasticsearch import Elasticsearch, helpers import contextlib +import logging ELASTIC_HOST = os.environ.get("ELASTIC_HOST","http://localhost:9200") ELASTIC_PASSWORD = os.environ.get("ELASTIC_PASSWORD","*l9qNGoojiCC4n9KcZhj") ELASTIC_QUERY = os.environ.get("ELASTIC_QUERY","Anwesend") @@ -13,6 +14,7 @@ ELASTIC_INDEX = os.environ.get("ELASTIC_INDEX","legacy") # Verbinde mit Client @contextlib.contextmanager def es_client(): + logging.debug(f"ELASIC HOST:%s" % ELASTIC_HOST) client = Elasticsearch(ELASTIC_HOST, verify_certs=False, basic_auth=('elastic', ELASTIC_PASSWORD)) yield client client.close() @@ -48,6 +50,7 @@ def es_search(query:str): if __name__ =="__main__": resp = es_search(ELASTIC_QUERY) + logging.info(f"Found %d recorts in hits" % resp["hits"]["hits"]) for hit in resp["hits"]["hits"]: print(f"\n\n%s\n%s\n%s - %s" % ( hit.get("_source",{}).get("url",""), diff --git a/test_search.py b/test_search.py index 7225643..e71f47a 100644 --- a/test_search.py +++ b/test_search.py @@ -1,13 +1,16 @@ import os -from elasticsearch import Elasticsearch, helpers -from searching import es_search, es_client +from searching import es_search ELASTIC_QUERY = os.environ.get("ELASTIC_QUERY","Anwesend") +import logging -#for hit in resp["hits"]["hits"]: +logging.basicConfig(level=logging.DEBUG) + +#for hit in resp["hits"]["hits"]: q # print(hit) if __name__ =="__main__": + logging.debug(f"searching with query: %s\n" % ELASTIC_QUERY) resp = es_search(ELASTIC_QUERY) for hit in resp["hits"]["hits"]: print(f"\n\n%s\n%s\n%s - %s" % (