From patchwork Thu Oct 26 14:06:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alassane Yattara X-Patchwork-Id: 32973 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43EFCC25B6B for ; Thu, 26 Oct 2023 14:06:27 +0000 (UTC) Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by mx.groups.io with SMTP id smtpd.web11.71463.1698329182474356462 for ; Thu, 26 Oct 2023 07:06:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@savoirfairelinux.com header.s=DFC430D2-D198-11EC-948E-34200CB392D2 header.b=u13n6F1U; spf=pass (domain: savoirfairelinux.com, ip: 208.88.110.44, mailfrom: alassane.yattara@savoirfairelinux.com) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id B77B79C29B3; Thu, 26 Oct 2023 10:06:21 -0400 (EDT) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavis, port 10032) with ESMTP id snts6Lg2pZJH; Thu, 26 Oct 2023 10:06:21 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 28A269C29BE; Thu, 26 Oct 2023 10:06:21 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.savoirfairelinux.com 28A269C29BE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=savoirfairelinux.com; s=DFC430D2-D198-11EC-948E-34200CB392D2; t=1698329181; bh=8ym42zoo+WidPdgMhxuC7AtOcHckYkV+n9gQQNFfZuM=; h=From:To:Date:Message-Id:MIME-Version; b=u13n6F1UxjEHhe4eCHiOklUCy3cMBLTX3czrNaLSnIkZpPADMW82KZW2yyDemEUct aNzYeMNKeCZTc4CodpD4FdDgBzjSVGrSllnKsPMOeOAq1VHRjlV5HHHaxFa+wIWJwv BLwPnyF1gaQcOg5iiHfYr2Ewc4dF5PUIGJIQnGJ758/LGpymGmPuwKpnVQuirTxzLT f9ZoqYTiaThjleoKmusRhAuvyg3h6X2wr0okn01usj5qhPrX3GQEkYfwGzDeOPibOL TWubIHmU1D1pCQzh/lhWwpCnfUfW26/ksOdXMzl6aESMgoGBQT6MU4tiCIR5obaXtc 3GMJfSao3i9aw== X-Virus-Scanned: amavis at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavis, port 10026) with ESMTP id GMNltJ0LXpDe; Thu, 26 Oct 2023 10:06:21 -0400 (EDT) Received: from jedi.. (unknown [196.127.183.75]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 0BB5D9C29B3; Thu, 26 Oct 2023 10:06:19 -0400 (EDT) From: Alassane Yattara To: toaster@lists.yoctoproject.org Cc: Tim Orling , Alassane Yattara Subject: [PATCH 1/3] Bug-fix logging permission error in docker Date: Thu, 26 Oct 2023 15:06:13 +0100 Message-Id: <20231026140615.792919-1-alassane.yattara@savoirfairelinux.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 26 Oct 2023 14:06:27 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/toaster/message/5889 From: Tim Orling toastermain: use BUILDDIR for logs Developer: Tim Orling Reviewer: Alassane Yattara Signed-off-by: Tim Orling Signed-off-by: Alassane Yattara --- bitbake/lib/toaster/toastermain/logs.py | 10 ++++++---- bitbake/lib/toaster/toastermain/settings.py | 5 +++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bitbake/lib/toaster/toastermain/logs.py b/bitbake/lib/toaster/toastermain/logs.py index b4910e4432..db5d459f9b 100644 --- a/bitbake/lib/toaster/toastermain/logs.py +++ b/bitbake/lib/toaster/toastermain/logs.py @@ -1,12 +1,14 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +import os import logging import json from pathlib import Path from django.http import HttpRequest -BASE_DIR = Path(__file__).resolve(strict=True).parent.parent +#BASE_DIR = Path(__file__).resolve(strict=True).parent.parent +BUILDDIR = os.environ.get("BUILDDIR") def log_api_request(request, response, view, logger_name='api'): @@ -108,7 +110,7 @@ LOGGING_SETTINGS = { 'file_django': { 'level': 'INFO', 'class': 'logging.handlers.TimedRotatingFileHandler', - 'filename': BASE_DIR / 'logs/django.log', + 'filename': BUILDDIR / 'logs/django.log', 'when': 'D', # interval type 'interval': 1, # defaults to 1 'backupCount': 10, # how many files to keep @@ -117,7 +119,7 @@ LOGGING_SETTINGS = { 'file_api': { 'level': 'INFO', 'class': 'logging.handlers.TimedRotatingFileHandler', - 'filename': BASE_DIR / 'logs/api.log', + 'filename': BUILDDIR / 'logs/api.log', 'when': 'D', 'interval': 1, 'backupCount': 10, @@ -126,7 +128,7 @@ LOGGING_SETTINGS = { 'file_toaster': { 'level': 'INFO', 'class': 'logging.handlers.TimedRotatingFileHandler', - 'filename': BASE_DIR / 'logs/toaster.log', + 'filename': BUILDDIR / 'logs/toaster.log', 'when': 'D', 'interval': 1, 'backupCount': 10, diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py index b083cf5885..50b873cb49 100644 --- a/bitbake/lib/toaster/toastermain/settings.py +++ b/bitbake/lib/toaster/toastermain/settings.py @@ -316,12 +316,13 @@ for t in os.walk(os.path.dirname(currentdir)): LOGGING = LOGGING_SETTINGS # Build paths inside the project like this: BASE_DIR / 'subdir'. -BASE_DIR = Path(__file__).resolve(strict=True).parent.parent +#BASE_DIR = Path(__file__).resolve(strict=True).parent.parent +BUILDDIR = os.environ.get("BUILDDIR") # LOG VIEWER # https://pypi.org/project/django-log-viewer/ LOG_VIEWER_FILES_PATTERN = '*.log*' -LOG_VIEWER_FILES_DIR = os.path.join(BASE_DIR, 'logs') +LOG_VIEWER_FILES_DIR = os.path.join(BUILDDIR, 'logs') LOG_VIEWER_PAGE_LENGTH = 25 # total log lines per-page LOG_VIEWER_MAX_READ_LINES = 100000 # total log lines will be read LOG_VIEWER_PATTERNS = ['INFO', 'DEBUG', 'WARNING', 'ERROR', 'CRITICAL']