From 8ba6333c3e5af980e464216f4ddddfc8bb414b59 Mon Sep 17 00:00:00 2001
From: ml bonhomme <bonhomme@teklia.com>
Date: Fri, 26 Jan 2024 10:29:48 +0000
Subject: [PATCH] Add time to tasks logs
---
arkindex_tasks/__init__.py | 4 ++++
arkindex_tasks/base.py | 1 -
arkindex_tasks/build_worker_version.py | 1 -
arkindex_tasks/generate_thumbnails.py | 1 -
arkindex_tasks/git.py | 1 -
arkindex_tasks/import_files/transkribus.py | 1 -
arkindex_tasks/import_git/__main__.py | 1 -
arkindex_tasks/import_git/base.py | 1 -
arkindex_tasks/import_git/worker.py | 1 -
arkindex_tasks/import_iiif/parser.py | 3 ---
arkindex_tasks/import_s3/__main__.py | 1 -
arkindex_tasks/import_s3/worker.py | 1 -
arkindex_tasks/init_elements.py | 1 -
arkindex_tasks/utils.py | 1 -
14 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/arkindex_tasks/__init__.py b/arkindex_tasks/__init__.py
index 1188dbc5..167ee981 100644
--- a/arkindex_tasks/__init__.py
+++ b/arkindex_tasks/__init__.py
@@ -1,10 +1,14 @@
# -*- coding: utf-8 -*-
+import logging
import pathlib
from arkindex import ArkindexClient, options_from_env
default_client = ArkindexClient(**options_from_env())
+logging.basicConfig(
+ format="[%(asctime)s] [%(levelname)s] %(message)s", level=logging.INFO
+)
# Read shared VERSION and expose it to Python internals
__version__ = (pathlib.Path(__file__).parent / "VERSION").read_text().strip()
diff --git a/arkindex_tasks/base.py b/arkindex_tasks/base.py
index e7904402..d096311d 100644
--- a/arkindex_tasks/base.py
+++ b/arkindex_tasks/base.py
@@ -12,7 +12,6 @@ from arkindex_tasks import default_client
from arkindex_tasks.enums import ProcessMode
from arkindex_tasks.utils import download_file
-logging.basicConfig(format="[%(levelname)s] %(message)s", level=logging.INFO)
logger = logging.getLogger(__name__)
WORKER_RUN_ID = os.environ.get("ARKINDEX_WORKER_RUN_ID")
diff --git a/arkindex_tasks/build_worker_version.py b/arkindex_tasks/build_worker_version.py
index 0c6d4007..cdb4633a 100644
--- a/arkindex_tasks/build_worker_version.py
+++ b/arkindex_tasks/build_worker_version.py
@@ -20,7 +20,6 @@ from apistar.exceptions import ErrorResponse
from arkindex_tasks import default_client
from arkindex_tasks.git import clone_repository
-logging.basicConfig(format="[%(levelname)s] %(message)s", level=logging.INFO)
logger = logging.getLogger(__name__)
cli = docker.APIClient(
base_url=os.environ.get("DOCKER_HOST", "unix://var/run/docker.sock")
diff --git a/arkindex_tasks/generate_thumbnails.py b/arkindex_tasks/generate_thumbnails.py
index dbc4a4fe..ba76b285 100644
--- a/arkindex_tasks/generate_thumbnails.py
+++ b/arkindex_tasks/generate_thumbnails.py
@@ -14,7 +14,6 @@ from tenacity import retry, retry_if_exception_type, stop_after_attempt, wait_fi
from arkindex_tasks import default_client
-logging.basicConfig(format="[%(levelname)s] %(message)s", level=logging.INFO)
logger = logging.getLogger(__name__)
diff --git a/arkindex_tasks/git.py b/arkindex_tasks/git.py
index 449bc9bc..24c26580 100644
--- a/arkindex_tasks/git.py
+++ b/arkindex_tasks/git.py
@@ -4,7 +4,6 @@ import os
import subprocess
import tempfile
-logging.basicConfig(format="[%(levelname)s] %(message)s", level=logging.INFO)
logger = logging.getLogger(__name__)
diff --git a/arkindex_tasks/import_files/transkribus.py b/arkindex_tasks/import_files/transkribus.py
index 52e47318..baffb68f 100644
--- a/arkindex_tasks/import_files/transkribus.py
+++ b/arkindex_tasks/import_files/transkribus.py
@@ -20,7 +20,6 @@ from arkindex_tasks.base import WORKER_RUN_ID, dump_json
from arkindex_tasks.import_files.pagexml import PageXmlParser
from arkindex_tasks.utils import default_client, retried_request
-logging.basicConfig(format="[%(levelname)s] %(message)s", level=logging.INFO)
logger = logging.getLogger(__name__)
diff --git a/arkindex_tasks/import_git/__main__.py b/arkindex_tasks/import_git/__main__.py
index 5d92db65..6f6a8b44 100644
--- a/arkindex_tasks/import_git/__main__.py
+++ b/arkindex_tasks/import_git/__main__.py
@@ -7,7 +7,6 @@ import uuid
from arkindex_tasks import default_client
from arkindex_tasks.import_git.base import GitImportTask
-logging.basicConfig(format="[%(levelname)s] %(message)s", level=logging.INFO)
logger = logging.getLogger(__name__)
diff --git a/arkindex_tasks/import_git/base.py b/arkindex_tasks/import_git/base.py
index 19c76223..595a5476 100644
--- a/arkindex_tasks/import_git/base.py
+++ b/arkindex_tasks/import_git/base.py
@@ -12,7 +12,6 @@ from arkindex_tasks.git import clone_repository
from arkindex_tasks.import_git.parser import configuration_parser
from arkindex_tasks.import_git.worker import GitWorkerImport
-logging.basicConfig(format="[%(levelname)s] %(message)s", level=logging.INFO)
logger = logging.getLogger(__name__)
# Minimum .arkindex.yml version that causes the Git import to do nothing
diff --git a/arkindex_tasks/import_git/worker.py b/arkindex_tasks/import_git/worker.py
index a78dec8f..32ffd241 100644
--- a/arkindex_tasks/import_git/worker.py
+++ b/arkindex_tasks/import_git/worker.py
@@ -9,7 +9,6 @@ from apistar.exceptions import ErrorResponse
from arkindex_tasks import __version__, default_client
-logging.basicConfig(format="[%(levelname)s] %(message)s", level=logging.INFO)
logger = logging.getLogger(__name__)
diff --git a/arkindex_tasks/import_iiif/parser.py b/arkindex_tasks/import_iiif/parser.py
index 7b2fdde5..dc9fef19 100644
--- a/arkindex_tasks/import_iiif/parser.py
+++ b/arkindex_tasks/import_iiif/parser.py
@@ -14,9 +14,6 @@ from arkindex_tasks.base import WORKER_RUN_ID
from arkindex_tasks.enums import MetaType
from arkindex_tasks.utils import retried_request
-logging.basicConfig(
- format="%(asctime)s [%(levelname)s] %(message)s", level=logging.INFO
-)
logger = logging.getLogger(__name__)
# Timeout for the info.json request on images
diff --git a/arkindex_tasks/import_s3/__main__.py b/arkindex_tasks/import_s3/__main__.py
index 17582b19..27231153 100644
--- a/arkindex_tasks/import_s3/__main__.py
+++ b/arkindex_tasks/import_s3/__main__.py
@@ -7,7 +7,6 @@ import uuid
from arkindex_tasks import default_client
from arkindex_tasks.import_s3.worker import S3Import
-logging.basicConfig(format="[%(levelname)s] %(message)s", level=logging.INFO)
logger = logging.getLogger(__name__)
diff --git a/arkindex_tasks/import_s3/worker.py b/arkindex_tasks/import_s3/worker.py
index ef56d378..027d9aed 100644
--- a/arkindex_tasks/import_s3/worker.py
+++ b/arkindex_tasks/import_s3/worker.py
@@ -18,7 +18,6 @@ from arkindex_tasks.import_s3.graph import PATH_DELIMITER, Node
from arkindex_tasks.utils import retried_request
from botocore.exceptions import ClientError
-logging.basicConfig(format="[%(levelname)s] %(message)s", level=logging.INFO)
logger = logging.getLogger(__name__)
diff --git a/arkindex_tasks/init_elements.py b/arkindex_tasks/init_elements.py
index 87758dba..432139a6 100644
--- a/arkindex_tasks/init_elements.py
+++ b/arkindex_tasks/init_elements.py
@@ -15,7 +15,6 @@ from time import sleep
from arkindex_tasks import default_client
from arkindex_tasks.base import dump_json, split_chunks
-logging.basicConfig(format="[%(levelname)s] %(message)s", level=logging.INFO)
logger = logging.getLogger(__name__)
diff --git a/arkindex_tasks/utils.py b/arkindex_tasks/utils.py
index 04701083..becd8afb 100644
--- a/arkindex_tasks/utils.py
+++ b/arkindex_tasks/utils.py
@@ -16,7 +16,6 @@ from tenacity import (
from arkindex_tasks import default_client
-logging.basicConfig(format="[%(levelname)s] %(message)s", level=logging.INFO)
logger = logging.getLogger(__name__)
DOWNLOAD_CHUNK_SIZE = 8192
--
GitLab