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.

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

Fix for gravity cronjob #3599

Merged
merged 4 commits into from
Jul 21, 2020
Merged

Fix for gravity cronjob #3599

merged 4 commits into from
Jul 21, 2020

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Jul 21, 2020

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes, and have included unit tests where possible.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)

What does this PR aim to accomplish?:

  1. Fix gravity cronjob path
  2. pidof does not always find pihole-FTL even when it is running

How does this PR accomplish the above?:

  1. /usr/sbin is missing so service cannot be found, add /usr/sbin to PATH
  2. Switch from killall + pidof to pkill and pgrep

What documentation changes (if any) are needed to support this PR?:

None

…. This solves some issues especially when there are many TCP workers floating around.

Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER added the Bug: fixed Contains a bug resolution label Jul 21, 2020
@DL6ER DL6ER added this to the v5.1.2 milestone Jul 21, 2020
@DL6ER DL6ER requested review from PromoFaux and dschaper July 21, 2020 19:24
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/error-in-var-log-pihole-updategravity-log/35862/54

gravity.sh Outdated Show resolved Hide resolved
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER merged commit 61616b8 into release/v5.1.2 Jul 21, 2020
@DL6ER DL6ER deleted the fix/gravity_cronjob branch July 21, 2020 21:11
@PromoFaux PromoFaux mentioned this pull request Jul 24, 2020
@PromoFaux PromoFaux mentioned this pull request Aug 4, 2020
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/error-in-pihole-ftl-log-when-running-pihole-g/36937/1

@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-ftl-v5-2-released/36964/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug: fixed Contains a bug resolution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants