Improve PID detection in pihole-FTL.service #2767
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
Can we utilize the PID file? |
AzureMarker
previously approved these changes
May 31, 2019
… is empty), fall back to using pidof + awk Signed-off-by: DL6ER <dl6er@dl6er.de>
DL6ER
changed the title
|
@Mcat12 We utilize the PIDFILE now. The title and description have been corrected, accordingly. |
AzureMarker
approved these changes
Jun 1, 2019
Merged
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/pi-hole-4-3-2-release-notes/23852/1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By submitting this pull request, I confirm the following:
please fill any appropriate checkboxes, e.g: [X]
git rebase)Please make sure you Sign Off all commits. Pi-hole enforces the DCO.
What does this PR aim to accomplish?:
When
dhcp-scriptis used, the parent process will stay active. This caused some of theservicecommands to malfunction. This PR fixes this issue. Thanks @RamSet for reporting this issue.How does this PR accomplish the above?:
We try to obtain the PID from the PID file of
pihole-FTL. If this is not possible, we fall back to the previously used method usingpidofwhile, when multiple PIDs are returned bypidof, we select the last (=highest) PID.This ensures that we send signals to the process that handles the signal appropriately.
What documentation changes (if any) are needed to support this PR?:
None