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

Exit after fatal dnsmasq errors #1946

Merged
merged 1 commit into from
May 8, 2024
Merged

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented May 4, 2024

What does this implement/fix?

Fixes a bug introduced in #1881 where fatal dnsmasq config line errors can lead to FTL crashing after logging that there is a fatal event. The expected behavior is to cleanly return an error code instead of crashing which is restored by this PR.

This small fix is meant to go out as FTL v5.25.2


Related issue or feature (if applicable): Fixes #1942

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from a team May 4, 2024 08:16
@DL6ER DL6ER mentioned this pull request May 4, 2024
@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/pihole-ftl-suddenly-started-to-fail-on-docker/69933/9

@PromoFaux PromoFaux merged commit 8943e26 into master May 8, 2024
19 checks passed
@PromoFaux PromoFaux deleted the fix/crash_fatal_dnsmasq_err_v5 branch May 8, 2024 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

crash on internet outage
5 participants