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

Always terminate the container if pihole-FTL binary exits #1649

Merged
merged 4 commits into from
Oct 10, 2024
Merged

Always terminate the container if pihole-FTL binary exits #1649

merged 4 commits into from
Oct 10, 2024

Commits on Oct 6, 2024

  1. Always terminate the container if pihole-FTL binary exits. Either nat… 

    …urally or via an error. Don't attempt to restart it, allow the container's restart policy to do this.

Signed-off-by: Adam Warner <[email protected]>
    @PromoFaux
    PromoFaux committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    210a117 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Clean up the code - at the end of the start() function, wait for the … 

    …start_ftl process and pass it's exit code to stop.

Add in additional while/wait to ensure that after the FTL log exists, it contains the "FTL Started" line

Signed-off-by: Adam Warner <[email protected]>
    @PromoFaux
    PromoFaux committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    9e37aa8 View commit details
    Browse the repository at this point in the history

  2. Update src/start.sh 

    Co-authored-by: RD WebDesign <[email protected]>
Signed-off-by: Adam Warner <[email protected]>
    @PromoFaux @rdwebdesign
    PromoFaux and rdwebdesign authored Oct 7, 2024
    Configuration menu
    Copy the full SHA
    f9b6999 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Monitor the capsh pid, not FTL pid. If stop is called without an exit… 

    … code being passed to it, then FTL is still running - so we stop FTL and then get the exit code from the capsh PID by immediately `wait`ing it after killing FTL

Signed-off-by: Adam Warner <[email protected]>
    @PromoFaux
    PromoFaux committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    add6973 View commit details
    Browse the repository at this point in the history