Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

powerdevil: backport fix for debug log spam #94301

Closed
wants to merge 0 commits into from
Closed

powerdevil: backport fix for debug log spam #94301

wants to merge 0 commits into from

Conversation

kini
Copy link
Member

@kini kini commented Jul 31, 2020

Motivation for this change

The version of powerdevil we're using prints a few debug messages every time an
inhibition is triggered, including some spurious messages about not being able
to contact consolekit. This can cause a lot of spam in the system journal,
especially when a web browser or other application that plays video is running,
because such applications often trigger such inhibitions very frequently.

A recent upstream commit to powerdevil changes the logging behavior of the
program so that it doesn't print debug messages anymore. This commit backports
that patch to our version of powerdevil (5.17.5).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@kini kini requested a review from ttuegel as a code owner July 31, 2020 07:53
@kini kini force-pushed the powerdevil/debug-log-spam branch from e659c2e to 7917971 Compare August 10, 2020 04:00
@kini kini force-pushed the powerdevil/debug-log-spam branch from 7917971 to 5edbf05 Compare August 20, 2020 06:38
@kini
Copy link
Member Author

kini commented Aug 20, 2020

Come to think of it, since this is a backport, should I target this PR to the 20.03 branch instead of master?

@kini kini force-pushed the powerdevil/debug-log-spam branch from 5edbf05 to 73fd8c8 Compare August 22, 2020 18:44
@kini kini requested a review from zowoq as a code owner August 22, 2020 18:44
@kini kini changed the base branch from master to release-20.03 August 22, 2020 18:44
@kini
Copy link
Member Author

kini commented Aug 22, 2020 •
edited

Yikes, sorry for the spam, everyone. It seems to have happened when I swapped base branches on this PR. I'll try to remove people.

EDIT: OK, that worked... hopefully it also removed everyone from the subscriber list of the PR, which I can't see or change. Note to self / posterity: don't retarget PRs from master to a nixos release branch (or probably vice versa), because you can't do that atomically at the same time as pushing a rebased branch, so github automatically adds all code owners of anything that differs between master and the release branch as reviewers to your PR 🤯 guess I should have just created a new PR... geez

EDIT 2:

<samueldr> kini: use `git merge-base` and rebase on that
<samueldr> force push first, which should be a no-op, and then you can change
<kini> samueldr: Ah, that's a good idea, didn't think of that. Thanks! I'll keep that in mind.
<kini> so it'll be like, 1) rebase on the merge base 2) force push 3) retarget the PR 4) rebase on the release branch 5) force push again

@kini kini closed this Aug 22, 2020
@kini kini force-pushed the powerdevil/debug-log-spam branch from 73fd8c8 to 7ae6e51 Compare August 22, 2020 19:06
@kini
Copy link
Member Author

kini commented Aug 22, 2020 •
edited

Based on a conversation in IRC I tried to implement the above procedure to move this PR back to target master (because apparently the answer to my question above is "no"). But when I pushed the merge base (7ae6e51), it closed the PR, and now I can't do step 3 (retarget the PR) since github won't let me retarget a closed PR. So I guess I'm just going to have to open a new PR. Sorry again for all the noise.

@kini kini mentioned this pull request Aug 22, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttuegel ttuegel Awaiting requested review from ttuegel

Assignees
No one assigned
Labels
6.topic: qt/kde 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@kini