diff --git a/build/utils.py b/build/utils.py index 91901b9..fa68513 100644 --- a/build/utils.py +++ b/build/utils.py @@ -12,13 +12,13 @@ # # You should have received a copy of the GNU General Public License along # with this program. If not, see . -import logging import re import urllib from os import walk from pathlib import Path from uuid import uuid4 +import structlog from yaml import load from yaml import Loader @@ -26,7 +26,7 @@ from . import exceptions as err from .conf import settings from repoapi.utils import open_jenkins_url -logger = logging.getLogger(__name__) +logger = structlog.get_logger(__name__) base_url = ( "{base}/job/{job}/buildWithParameters?" diff --git a/hotfix/utils.py b/hotfix/utils.py index 76f341c..b2af8a6 100644 --- a/hotfix/utils.py +++ b/hotfix/utils.py @@ -1,4 +1,4 @@ -# Copyright (C) 2016 The Sipwise Team - http://sipwise.com +# Copyright (C) 2016-2022 The Sipwise Team - http://sipwise.com # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -12,16 +12,17 @@ # # You should have received a copy of the GNU General Public License along # with this program. If not, see . -import logging import re +import structlog + from .models import WorkfrontNoteInfo from debian.changelog import Changelog from repoapi import utils hotfix_re_release = re.compile(r".+~(mr[0-9]+\.[0-9]+\.[0-9]+.[0-9]+)$") -logger = logging.getLogger(__name__) +logger = structlog.get_logger(__name__) def process_hotfix(jbi_info, projectname, path): diff --git a/release_dashboard/models.py b/release_dashboard/models.py index 7998771..7bd8df4 100644 --- a/release_dashboard/models.py +++ b/release_dashboard/models.py @@ -13,7 +13,6 @@ # You should have received a copy of the GNU General Public License along # with this program. If not, see . import json -import logging import re from datetime import datetime @@ -22,8 +21,6 @@ from django_extensions.db.fields import ModificationDateTimeField from .conf import settings -logger = logging.getLogger(__name__) - class Project(models.Model): name = models.CharField(max_length=50, unique=True, null=False) diff --git a/release_dashboard/utils/build.py b/release_dashboard/utils/build.py index 75e27f1..2029543 100644 --- a/release_dashboard/utils/build.py +++ b/release_dashboard/utils/build.py @@ -12,18 +12,18 @@ # # You should have received a copy of the GNU General Public License along # with this program. If not, see . -import logging import urllib import uuid import requests +import structlog from requests.auth import HTTPBasicAuth from ..conf import settings from ..models import Project from repoapi.utils import open_jenkins_url -logger = logging.getLogger(__name__) +logger = structlog.get_logger(__name__) project_url = ( "{base}/job/{job}/buildWithParameters?" diff --git a/release_dashboard/utils/docker.py b/release_dashboard/utils/docker.py index f02e209..4665f61 100644 --- a/release_dashboard/utils/docker.py +++ b/release_dashboard/utils/docker.py @@ -1,4 +1,4 @@ -# Copyright (C) 2017 The Sipwise Team - http://sipwise.com +# Copyright (C) 2017-2022 The Sipwise Team - http://sipwise.com # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -13,16 +13,16 @@ # You should have received a copy of the GNU General Public License along # with this program. If not, see . import json -import logging import urllib import uuid import requests +import structlog from ..conf import settings from repoapi.utils import open_jenkins_url -logger = logging.getLogger(__name__) +logger = structlog.get_logger(__name__) docker_url = ( "{base}/job/build-project-docker/buildWithParameters?" diff --git a/release_dashboard/views/build.py b/release_dashboard/views/build.py index dac388d..3a1adfc 100644 --- a/release_dashboard/views/build.py +++ b/release_dashboard/views/build.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2020 The Sipwise Team - http://sipwise.com +# Copyright (C) 2015-2022 The Sipwise Team - http://sipwise.com # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -13,9 +13,9 @@ # You should have received a copy of the GNU General Public License along # with this program. If not, see . import json -import logging import uuid +import structlog from django.contrib.auth.decorators import login_required from django.http import HttpResponseNotFound from django.http import HttpResponseRedirect @@ -44,7 +44,7 @@ from ..utils import build from build.models import BuildRelease from build.utils import ReleaseConfig -logger = logging.getLogger(__name__) +logger = structlog.get_logger(__name__) @login_required diff --git a/release_dashboard/views/docker.py b/release_dashboard/views/docker.py index a5b3bfc..ca9008c 100644 --- a/release_dashboard/views/docker.py +++ b/release_dashboard/views/docker.py @@ -12,9 +12,9 @@ # # You should have received a copy of the GNU General Public License along # with this program. If not, see . -import logging import re +import structlog from django.contrib.auth.decorators import login_required from django.http import Http404 from django.http import JsonResponse @@ -37,7 +37,7 @@ from ..models import DockerTag from ..models import Project from ..utils import docker -logger = logging.getLogger(__name__) +logger = structlog.get_logger(__name__) def _get_docker_tags(project, tag=None): @@ -50,7 +50,7 @@ def _get_docker_tags(project, tag=None): res = {"name": image} tags = docker.get_docker_tags(image) if tag: - logger.degug("non filtered tags: %s" % tags) + logger.debug("non filtered tags: %s" % tags) tags = filter(re.compile(tag).match, tags) res["tags"] = tags docker_tags.append(res)