From patchwork Thu Oct 26 14:12:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alassane Yattara X-Patchwork-Id: 32978 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 488F7C25B6B for ; Thu, 26 Oct 2023 14:13:07 +0000 (UTC) Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by mx.groups.io with SMTP id smtpd.web11.71693.1698329581268526581 for ; Thu, 26 Oct 2023 07:13:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@savoirfairelinux.com header.s=DFC430D2-D198-11EC-948E-34200CB392D2 header.b=KmQfZOQZ; 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 34EF39C279D; Thu, 26 Oct 2023 10:13:00 -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 ueyVjyzKdWs1; Thu, 26 Oct 2023 10:12:58 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id C72729C2BD5; Thu, 26 Oct 2023 10:12:58 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.savoirfairelinux.com C72729C2BD5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=savoirfairelinux.com; s=DFC430D2-D198-11EC-948E-34200CB392D2; t=1698329578; bh=8ym42zoo+WidPdgMhxuC7AtOcHckYkV+n9gQQNFfZuM=; h=From:To:Date:Message-Id:MIME-Version; b=KmQfZOQZpnxw50Jam0yV08pkwLQPsgsD+r75MvhVDe5QurExoWC3s9W6Iy7cXx7ao zXG4jUQQfvRQYJITrm/ZECUb4r7AK7M3XXChlbkjAo5jad3sHao6ihOQSLUuZhkDn0 OBM779sb7svGSLeWEu9q5vRYAE9G2y/94UnYOsLOyIwq/phyv5SYuZE5EQmaBhNQQw VW9+o/4Zrpjhn6JWLI24nGvo0lmfHnK1Njc8CSOk+OX16bmY7Ld4/DhhnG7WDDY//p 5DnsMfVwkjJ8PtXA/OK89r9Af9yGSNE6z1szmcVqEo2B2HXrUw85r8b+aA4RE3aBIb n+jgZJMImKIkg== 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 ZEkiE_dqSHQY; Thu, 26 Oct 2023 10:12:58 -0400 (EDT) Received: from jedi.. (unknown [196.127.183.75]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id D15509C279D; Thu, 26 Oct 2023 10:12:57 -0400 (EDT) From: Alassane Yattara To: toaster@lists.yoctoproject.org Cc: Tim Orling , Alassane Yattara Subject: [PATCH v2 1/3] Toaster: Bug-fix logging permission error in docker Date: Thu, 26 Oct 2023 15:12:47 +0100 Message-Id: <20231026141249.799473-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:13:07 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/toaster/message/5892 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:12:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alassane Yattara X-Patchwork-Id: 32977 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 428E1C25B48 for ; Thu, 26 Oct 2023 14:13:07 +0000 (UTC) Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by mx.groups.io with SMTP id smtpd.web11.71695.1698329583497741775 for ; Thu, 26 Oct 2023 07:13:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@savoirfairelinux.com header.s=DFC430D2-D198-11EC-948E-34200CB392D2 header.b=Wu3z+tm6; 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 D0A0A9C279D; Thu, 26 Oct 2023 10:13: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 1MsvZYoDZINO; Thu, 26 Oct 2023 10:13:02 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 4EE9E9C2BF6; Thu, 26 Oct 2023 10:13:02 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.savoirfairelinux.com 4EE9E9C2BF6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=savoirfairelinux.com; s=DFC430D2-D198-11EC-948E-34200CB392D2; t=1698329582; bh=VVGjltAFHNtRNQNKFfHWAfDN6tWxVLONawhl/DkVzt4=; h=From:To:Date:Message-Id:MIME-Version; b=Wu3z+tm69lybZM9P1H9MzqOTaLwra9/5CM2qnO8rZIs1NAq5FsaDs0V2xhT9ptXLi cqtcRBkWjjp2nJvpUq5QvFo+aXKv8KrJOFhsBOCV6d5pSuHtbbVsoaHMEYAl2Zuluh AP/bLmESxqphJ97ZtUh1VnOjlxxeGNeNi8OGBC/hudx5GoyxOAjIEXysGW/WdQ0PkJ JuRZ39DqvOW1BtwnwsfOeNA3JSjA7c8XRaZhcV9e4JVSOeW5wsGcU8sSwAWTXVqlG5 vptzQ12GyAEnXyqccRRo8UpTIAcPj7G6CGAfhtuXrNaA3PP8LHYGkQFBdO68zPCreQ qrB9rW1TUM2EA== 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 jVgP1FCppRC9; Thu, 26 Oct 2023 10:13:02 -0400 (EDT) Received: from jedi.. (unknown [196.127.183.75]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 69CAE9C2BD5; Thu, 26 Oct 2023 10:13:01 -0400 (EDT) From: Alassane Yattara To: toaster@lists.yoctoproject.org Cc: Tim Orling , Alassane Yattara Subject: [PATCH v2 2/3] Toaster: Bug-fix logging permission error in docker Date: Thu, 26 Oct 2023 15:12:48 +0100 Message-Id: <20231026141249.799473-2-alassane.yattara@savoirfairelinux.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231026141249.799473-1-alassane.yattara@savoirfairelinux.com> References: <20231026141249.799473-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:13:07 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/toaster/message/5893 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:12:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alassane Yattara X-Patchwork-Id: 32979 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 422A1C25B67 for ; Thu, 26 Oct 2023 14:13:17 +0000 (UTC) Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by mx.groups.io with SMTP id smtpd.web10.201330.1698329586354969724 for ; Thu, 26 Oct 2023 07:13:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@savoirfairelinux.com header.s=DFC430D2-D198-11EC-948E-34200CB392D2 header.b=URWlcUxe; 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 ADFD99C2BD5; Thu, 26 Oct 2023 10:13:05 -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 Qm103Hd_Ew_L; Thu, 26 Oct 2023 10:13:05 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 2E7719C2C58; Thu, 26 Oct 2023 10:13:05 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.savoirfairelinux.com 2E7719C2C58 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=savoirfairelinux.com; s=DFC430D2-D198-11EC-948E-34200CB392D2; t=1698329585; bh=NzuNxM4wE0OFoYTR7HX2zx3eKx31JlgpCK6zh8E76NU=; h=From:To:Date:Message-Id:MIME-Version; b=URWlcUxekgDcOFSu9/QE0yrXOG7pfRfeLfgrOuKRp3LNxYOxIcjXA63rYeE4VNzjz iyO3UAqSbC5gJFe2sOkFBCsiSFXB+Ck4fUEUgw/OFNjuaxkCFrtCmjEcXHf7/QfV6I 0sUc1bfcYbOXM7pS77hic76TcW7A2Rnzuz0gVq38pMuwFCt/CUMOfVSJWw+PSosCIM mJ9ZHYQj0uEfndHV2E3JWo+BBirXmNO54P2Ouafo1Q9MvOS9uoEM8nkshAKH7V4OuH 7wWFVp15EqrPInkBvOAVwkos1hb4aXhNz1xpTIiIelnRtYojhEu3NGB6twIhP784+t +S4C3OjxTLALw== 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 t-fpisVmeKT9; Thu, 26 Oct 2023 10:13:05 -0400 (EDT) Received: from jedi.. (unknown [196.127.183.75]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 4ECC19C279D; Thu, 26 Oct 2023 10:13:04 -0400 (EDT) From: Alassane Yattara To: toaster@lists.yoctoproject.org Cc: Tim Orling , Alassane Yattara Subject: [PATCH v2 3/3] Toaster: Bug-fix logging permission error in docker Date: Thu, 26 Oct 2023 15:12:49 +0100 Message-Id: <20231026141249.799473-3-alassane.yattara@savoirfairelinux.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231026141249.799473-1-alassane.yattara@savoirfairelinux.com> References: <20231026141249.799473-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:13:17 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/toaster/message/5894 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,