X Tutup
Commit 41c73db7 authored by Jelle van der Waa's avatar Jelle van der Waa 🚧 Committed by Jelle van der Waa
Browse files

fix(pyproject.toml): enable flake8-logging-format rule 

This ruleset makes sure we use lazily evaluated logging and no f-strings
so strings are created only when needed. For example if you didn't
enable debug logging the debug log strings are not formatted.
parent 108040a8

aurweb/asgi.py

+2 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ async def internal_server_error(request: Request, exc: Exception) -> Response: 
            logger.info(endp)

            resp = requests.post(endp, json=data, headers=headers)

            if resp.status_code != http.HTTPStatus.CREATED:

                logger.error(f"Unable to report exception to {repo}: {resp.text}")

                logger.error("Unable to report exception to %s: %s", repo, resp.text)

        else:

            logger.warning(

                "Unable to report an exception found due to "
@@ -202,7 +202,7 @@ async def internal_server_error(request: Request, exc: Exception) -> Response: 
            )



        # Log details about the exception traceback.

        logger.error(f"FATAL[{tb_id}]: An unexpected exception has occurred.")

        logger.error("FATAL[%s]: An unexpected exception has occurred.", tb_id)

        logger.error(tb)

    else:

        retval = retval.decode()

aurweb/pkgbase/actions.py

+4 −2
Original line number Diff line number Diff line
@@ -187,8 +187,10 @@ def pkgbase_merge_instance( 


    # Log this out for accountability purposes.

    logger.info(

        f"Package Maintainer '{request.user.Username}' merged "

        f"'{pkgbasename}' into '{target.Name}'."

        "Package Maintainer '%s' merged '%s' into '%s'.",

        request.user.Username,

        pkgbasename,

        target.Name,

    )



    # Send notifications.

aurweb/ratelimit.py

+1 −1
Original line number Diff line number Diff line
@@ -112,6 +112,6 @@ def check_ratelimit(request: Request): 
    limit = config.getint("ratelimit", "request_limit")

    exceeded_ratelimit = requests > limit

    if exceeded_ratelimit:

        logger.debug(f"{host} has exceeded the ratelimit.")

        logger.debug("%s has exceeded the ratelimit.", host)



    return exceeded_ratelimit

aurweb/routers/packages.py

+3 −2
Original line number Diff line number Diff line
@@ -455,8 +455,9 @@ async def packages_delete( 


    # Log out the fact that this happened for accountability.

    logger.info(

        f"Privileged user '{request.user.Username}' deleted the "

        f"following package bases: {str(deleted_bases)}."

        "Privileged user '%s' deleted the following package bases: %s.",

        request.user.Username,

        deleted_bases,

    )



    util.apply_all(notifs, lambda n: n.send())

aurweb/routers/pkgbase.py

+5 −5
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ async def pkgbase_comaintainers_post( 
    users_to_rm = records.difference(users)

    pkgbaseutil.remove_comaintainers(pkgbase, users_to_rm)

    logger.debug(

        f"{request.user} removed comaintainers from {pkgbase.Name}: {users_to_rm}"

        "%s removed comaintainers from %s: %s", request.user, pkgbase.Name, users_to_rm

    )



    users_to_add = users.difference(records)
@@ -726,7 +726,7 @@ async def pkgbase_comaintainers_post( 
        return render_template(request, "pkgbase/comaintainers.html", context)



    logger.debug(

        f"{request.user} added comaintainers to {pkgbase.Name}: {users_to_add}"

        "%s added comaintainers to %s: %s", request.user, pkgbase.Name, users_to_add

    )



    return RedirectResponse(
@@ -776,7 +776,7 @@ async def pkgbase_request_post( 
    try:

        validate.request(pkgbase, type, comments, merge_into, context)

    except ValidationError as exc:

        logger.error(f"Request Validation Error: {str(exc.data)}")

        logger.error("Request Validation Error: %s", exc.data)

        context["errors"] = exc.data

        return render_template(request, "pkgbase/request.html", context)
@@ -824,12 +824,12 @@ async def pkgbase_request_post( 
            request.user.ID, pkgreq.ID, pkgreq.status_display()

        )

        notif.send()

        logger.debug(f"New request #{pkgreq.ID} is marked for auto-orphan.")

        logger.debug("New request #%s is marked for auto-orphan.", pkgreq.ID)

    elif type == "deletion" and is_maintainer and outdated:

        # This request should be auto-accepted.

        notifs = actions.pkgbase_delete_instance(request, pkgbase, comments=comments)

        util.apply_all(notifs, lambda n: n.send())

        logger.debug(f"New request #{pkgreq.ID} is marked for auto-deletion.")

        logger.debug("New request #%s is marked for auto-deletion.", pkgreq.ID)



    # Redirect the submitting user to /packages.

    return RedirectResponse("/packages", status_code=HTTPStatus.SEE_OTHER)
X Tutup