From patchwork Thu Oct 26 14:04:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alassane Yattara X-Patchwork-Id: 32969 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 551BDC25B6B for ; Thu, 26 Oct 2023 14:05:47 +0000 (UTC) Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by mx.groups.io with SMTP id smtpd.web11.71438.1698329139715946284 for ; Thu, 26 Oct 2023 07:05:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@savoirfairelinux.com header.s=DFC430D2-D198-11EC-948E-34200CB392D2 header.b=Rq4U92Dn; 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 6EBCA9C29B3; Thu, 26 Oct 2023 10:05:38 -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 CeBHcSeUJ4Xt; Thu, 26 Oct 2023 10:05:37 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id B19789C2D0E; Thu, 26 Oct 2023 10:05:37 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.savoirfairelinux.com B19789C2D0E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=savoirfairelinux.com; s=DFC430D2-D198-11EC-948E-34200CB392D2; t=1698329137; bh=8ym42zoo+WidPdgMhxuC7AtOcHckYkV+n9gQQNFfZuM=; h=From:To:Date:Message-Id:MIME-Version; b=Rq4U92Dn7xDMU8+g8aWUY4i2HBimMG+4A4rHeVDiQXXAMzkHR96RNshf5APQuOVYI 8sFpljASjRRmFsn5ewQcY4WAkM+sDSu0/Yxlz4/MWmWkUL0F7+rfli+5Pwr4SakddD +tL6tXoK8mCvEqREmF2XB7KrYiz5kzPerRiYYQ7uKXHjyCbKYzZYOPsYXtbAb47Us8 dB3gYD3A3PLnxk+EtfD0Pqjdc3/vWjA/SDGcfalHiFeeVW51BvsMbdSVQ/+h2Z2EVs RyV8RFxOGPdDuqhAERJStaKpbu1tnMgNzE2Gp78xOsRSYx2YduaPYewdOovfq6ZgNa 5LBmjlufQn+Yw== 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 67bCds8eM_eD; Thu, 26 Oct 2023 10:05:37 -0400 (EDT) Received: from jedi.. (unknown [196.127.183.75]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id A02F69C29B3; Thu, 26 Oct 2023 10:05:36 -0400 (EDT) From: Alassane Yattara To: bitbake-devel@lists.openembedded.org Cc: Tim Orling , Alassane Yattara Subject: [PATCH 1/3] Bug-fix logging permission error in docker Date: Thu, 26 Oct 2023 15:04:51 +0100 Message-Id: <20231026140453.790676-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:05:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/15287 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'] From patchwork Thu Oct 26 14:04:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alassane Yattara X-Patchwork-Id: 32970 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 3938CC25B48 for ; Thu, 26 Oct 2023 14:06:07 +0000 (UTC) Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by mx.groups.io with SMTP id smtpd.web10.201090.1698329159879402415 for ; Thu, 26 Oct 2023 07:06:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@savoirfairelinux.com header.s=DFC430D2-D198-11EC-948E-34200CB392D2 header.b=GHvTMn/j; 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 3765D9C29B3; Thu, 26 Oct 2023 10:05:59 -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 bD22b6TF-1m9; Thu, 26 Oct 2023 10:05:58 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id C5FC19C29BE; Thu, 26 Oct 2023 10:05:58 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.savoirfairelinux.com C5FC19C29BE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=savoirfairelinux.com; s=DFC430D2-D198-11EC-948E-34200CB392D2; t=1698329158; bh=VVGjltAFHNtRNQNKFfHWAfDN6tWxVLONawhl/DkVzt4=; h=From:To:Date:Message-Id:MIME-Version; b=GHvTMn/jKqYEZDiyQuAl2wreI8dVwZ0V2eNryfXRWhfxvijk6VireRyyq47HFRsk0 x4D2oC/0/reX1ET9/CXOXJTma7r59JKkFiy75dGdj1joi2kjifOLWZ/APX+tL62wqf LFewdkn1HYIgBkB7805sAqGbJsBwpY2c8i/nx8qXbCSzWzNC7jeVzu6F10tC8QsOII 0xJ2dLNcy32/6+PMIkYcfsgba+ti+P/ewYnm+r8RpnIQkAkKhvrTOBtEC6eDwpH0zP r55y8apo0sD8kJu8BjAzITvykYzv9Xd/SLjPVfK1xzvmV6lop0Vt75rx40uzOCw9U3 hNpek69K22xkQ== 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 GRzcSvg0vhhN; Thu, 26 Oct 2023 10:05:58 -0400 (EDT) Received: from jedi.. (unknown [196.127.183.75]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id AFC229C29B3; Thu, 26 Oct 2023 10:05:57 -0400 (EDT) From: Alassane Yattara To: bitbake-devel@lists.openembedded.org Cc: Tim Orling , Alassane Yattara Subject: [PATCH 2/3] Bug-fix logging permission error in docker Date: Thu, 26 Oct 2023 15:04:52 +0100 Message-Id: <20231026140453.790676-2-alassane.yattara@savoirfairelinux.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231026140453.790676-1-alassane.yattara@savoirfairelinux.com> References: <20231026140453.790676-1-alassane.yattara@savoirfairelinux.com> 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:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/15288 From: Tim Orling toastermain: try Path(os.environ.get('BUILDDIR') Developer: Tim Orling Reviewer: Alassane Yattara Signed-off-by: Tim Orling Signed-off-by: Alassane Yattara --- bitbake/lib/toaster/toastermain/logs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbake/lib/toaster/toastermain/logs.py b/bitbake/lib/toaster/toastermain/logs.py index db5d459f9b..573fbef9e5 100644 --- a/bitbake/lib/toaster/toastermain/logs.py +++ b/bitbake/lib/toaster/toastermain/logs.py @@ -8,7 +8,7 @@ from pathlib import Path from django.http import HttpRequest #BASE_DIR = Path(__file__).resolve(strict=True).parent.parent -BUILDDIR = os.environ.get("BUILDDIR") +BUILDDIR = Path(os.environ.get('BUILDDIR')) def log_api_request(request, response, view, logger_name='api'): From patchwork Thu Oct 26 14:04:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alassane Yattara X-Patchwork-Id: 32971 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 3EF85C25B6B for ; Thu, 26 Oct 2023 14:06:07 +0000 (UTC) Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by mx.groups.io with SMTP id smtpd.web11.71449.1698329163586461798 for ; Thu, 26 Oct 2023 07:06:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@savoirfairelinux.com header.s=DFC430D2-D198-11EC-948E-34200CB392D2 header.b=jl4+8W29; 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 C0EE59C29B3; Thu, 26 Oct 2023 10:06:02 -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 u7NGYu3uJTf2; Thu, 26 Oct 2023 10:06:02 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 311229C2D0E; Thu, 26 Oct 2023 10:06:02 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.savoirfairelinux.com 311229C2D0E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=savoirfairelinux.com; s=DFC430D2-D198-11EC-948E-34200CB392D2; t=1698329162; bh=NzuNxM4wE0OFoYTR7HX2zx3eKx31JlgpCK6zh8E76NU=; h=From:To:Date:Message-Id:MIME-Version; b=jl4+8W29qe8DMq31/EPDks3rjazGqRixz0TCYxH36VAD7kZIwOZkzz1BcMX/EXBtJ SPMwMXzsQ0upn17fvo4ASbnNecJn7RaPqU9KxkMS12HSFeoIhAdtkf6aVb94N4EvDS nu+yvrpMFFesFLnV7EtgTWX6muWX2bHuydmqpb8lD1hrRevngpP6kihmyWWeKUCbDG LGlnMyHSQqmFKvScWIIOOloaPBgfnljFWt5pnM5QCEe09NZDak06OiYP+PZmUOs+ki wxjbRMzEpnsO3T87T+scX8VYyBRj882ySXAwaQf62fqDdvipzvaIbfedulBi//9Ty5 CRqRtV6p5q+HQ== 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 7gw42dis__hU; Thu, 26 Oct 2023 10:06:02 -0400 (EDT) Received: from jedi.. (unknown [196.127.183.75]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 185AA9C29B3; Thu, 26 Oct 2023 10:06:00 -0400 (EDT) From: Alassane Yattara To: bitbake-devel@lists.openembedded.org Cc: Tim Orling , Alassane Yattara Subject: [PATCH 3/3] Bug-fix logging permission error in docker Date: Thu, 26 Oct 2023 15:04:53 +0100 Message-Id: <20231026140453.790676-3-alassane.yattara@savoirfairelinux.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231026140453.790676-1-alassane.yattara@savoirfairelinux.com> References: <20231026140453.790676-1-alassane.yattara@savoirfairelinux.com> 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:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/15289 From: Tim Orling Update toastermain, write logs to BUILDDIR Maybe we should use TOASTER_DIR which is set by bin/toaster Developer: Tim Orling Reviewer: Alassane Yattara Signed-off-by: Tim Orling Signed-off-by: Alassane Yattara --- bitbake/lib/toaster/toastermain/logs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/toaster/toastermain/logs.py b/bitbake/lib/toaster/toastermain/logs.py index 573fbef9e5..f8042db165 100644 --- a/bitbake/lib/toaster/toastermain/logs.py +++ b/bitbake/lib/toaster/toastermain/logs.py @@ -110,7 +110,7 @@ LOGGING_SETTINGS = { 'file_django': { 'level': 'INFO', 'class': 'logging.handlers.TimedRotatingFileHandler', - 'filename': BUILDDIR / 'logs/django.log', + 'filename': BUILDDIR / 'toaster_django.log', 'when': 'D', # interval type 'interval': 1, # defaults to 1 'backupCount': 10, # how many files to keep @@ -119,7 +119,7 @@ LOGGING_SETTINGS = { 'file_api': { 'level': 'INFO', 'class': 'logging.handlers.TimedRotatingFileHandler', - 'filename': BUILDDIR / 'logs/api.log', + 'filename': BUILDDIR / 'toaster_api.log', 'when': 'D', 'interval': 1, 'backupCount': 10, @@ -128,7 +128,7 @@ LOGGING_SETTINGS = { 'file_toaster': { 'level': 'INFO', 'class': 'logging.handlers.TimedRotatingFileHandler', - 'filename': BUILDDIR / 'logs/toaster.log', + 'filename': BUILDDIR / 'toaster.log', 'when': 'D', 'interval': 1, 'backupCount': 10,