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 possible infinite loop when Pi-hole ecosystem is not present #1098

Merged
merged 3 commits into from
Apr 11, 2021

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Apr 7, 2021

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide.
  • I have checked that another pull request for this purpose does not exist.
  • I have considered, and confirmed that this submission will be valuable to others.
  • I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  • I give this submission freely, and claim no ownership to its content.

How familiar are you with the codebase?:

10


The uninterruptible syscalls could have entered an infinite loop when logging that they can neither open nor create (due to missing permissions) the non-existing log file. Such a loop is now prevented.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER added the Bugfix label Apr 7, 2021
@DL6ER DL6ER requested a review from dschaper April 7, 2021 03:34
@dschaper
Copy link
Member

dschaper commented Apr 7, 2021

bash-5.1$ whoami
pihole
bash-5.1$ pihole-FTL -vv
****************************** FTL **********************************
Version:         vDev-6c5474e

****************************** dnsmasq ******************************
Version:         pi-hole-2.84
Compile options: IPv6 GNU-getopt no-DBus no-UBus no-i18n IDN DHCP DHCPv6 Lua TFTP no-conntrack ipset auth cryptohash DNSSEC loop-detect inotify dumpfile

****************************** SQLite3 ******************************
Version:         3.35.4
Compile options: COMPILER=gcc-9.3.0 DEFAULT_FOREIGN_KEYS OMIT_DEPRECATED OMIT_LOAD_EXTENSION OMIT_PROGRESS_CALLBACK THREADSAFE=1
******************************** LUA ********************************
Lua 5.4.1  Copyright (C) 1994-2020 Lua.org, PUC-Rio
bash-5.1$ pihole-FTL
Notice: Found no readable FTL config fileFATAL: Opening of FTL log (/var/log/pihole-FTL.log) failed!
       Make sure it exists and is writeable by user pihole

Completely nitpick but should there be a newline before the FATAL:?

@DL6ER DL6ER added the PR: Approval Required Open Pull Request, needs approval label Apr 9, 2021
@DL6ER
Copy link
Member Author

DL6ER commented Apr 10, 2021

@dschaper You are absolutely right, added.

@dschaper dschaper added PR: Approved Open Pull Request, Approved by required number of reviewers and removed PR: Approval Required Open Pull Request, needs approval labels Apr 11, 2021
@DL6ER DL6ER merged commit 5aceaaf into development Apr 11, 2021
@DL6ER DL6ER deleted the fix/log_not_available branch April 11, 2021 03:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bugfix PR: Approved Open Pull Request, Approved by required number of reviewers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants