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

Correctly retrieve IPv4/6 addresses for tailFunc() #1707

Merged
merged 1 commit into from Sep 24, 2017

Conversation

Projects
None yet
2 participants
@WaLLy3K
Copy link
Collaborator

WaLLy3K commented Sep 23, 2017

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?:

9


  • Source setupVars.conf for IP addresses
  • Add comments for readability
  • Use sed -E for readability
  • Move date into sed
  • Use updated colour codes
Correctly retrieve IPv4/6 addresses for tailFunc()
* Add comments for readability
* Use `sed -E` for readability
* Move `date` into `sed`
* Use updated colour codes
tail -f /var/log/pihole.log | sed -E \
-e "s,($(date +'%b %d ')| dnsmasq[.*[0-9]]),,g" \
-e "s,(.*(gravity.list|black.list| config ).* is (${IPV4_ADDRESS%/*}|${IPV6_ADDRESS:-NULL}).*),${COL_RED}&${COL_NC}," \
-e "s,.*(query\\[A|DHCP).*,${COL_NC}&${COL_NC}," \

This comment has been minimized.

Copy link
@Mcat12

Mcat12 Sep 23, 2017

Member

Why are there two backslashes when there was only one before? query\\[

This comment has been minimized.

Copy link
@WaLLy3K
@Mcat12

Mcat12 approved these changes Sep 23, 2017

@WaLLy3K WaLLy3K merged commit 05faa7b into development Sep 24, 2017

5 checks passed

codacy/pr Good work! A positive pull request.
Details
code-review/pullapprove Approved by Mcat12, WaLLy3K
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

@WaLLy3K WaLLy3K deleted the fix/tailFunc branch Sep 24, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.