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

Print human-readable timezone information #1981

Merged
merged 3 commits into from
Jun 2, 2024
Merged

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented May 30, 2024

What does this implement/fix?

Add timezone information in human-readable timestamps.

This change has been triggered by a user seeking help after they had found a mismatch of timestamps between their two Pi-holes. We have been able to track it down to one server using a local timezone and the other one having been set to UTC.

Old

2024-05-30 19:45:08.488 [3519896M] DEBUG_QUERIES: time.nist.gov is known as not to be blocked

New

2024-05-30 19:45:08.488 CEST [3519896M] DEBUG_QUERIES: time.nist.gov is known as not to be blocked

Related issue or feature (if applicable): (private communication)

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.

… this in the log files to not needlessly change for format. Open for discussion

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from a team May 30, 2024 17:54
@DL6ER DL6ER changed the title Add timezone information where this is appropriate Print human-readable timezone information May 30, 2024
Copy link

github-actions bot commented Jun 1, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

1 similar comment
Copy link

github-actions bot commented Jun 1, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: DL6ER <dl6er@dl6er.de>
Copy link

github-actions bot commented Jun 1, 2024

Conflicts have been resolved.

@yubiuser
Copy link
Member

yubiuser commented Jun 1, 2024

I think this is a useful feature which should be used everywhere. v6 will break a lot of existing stuff, I think it's OK to change the log format. (I think to remember we already change the format from v5 to V6 by including message severity...)

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Copy link
Member Author

DL6ER commented Jun 2, 2024

@yubiuser The timezone is now always there

Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2024-06-02 17:17:51.619 [46769M] INFO: Thread housekeeper (1) is idle, terminating it.
2024-06-02 17:17:51.619 [46769M] INFO: Thread DNS client (2) is idle, terminating it.
2024-06-02 17:17:51.619 [46769M] INFO: All threads joined
2024-06-02 17:17:51.623 [46769M] INFO: Stored 1 API session in the database
2024-06-02 17:17:52.820 [46769M] INFO: ########## FTL terminated after 19h 48m 55s  (code 0)! ##########
2024-06-02 17:17:53.250 CEST [60185M] INFO: ########## FTL started on nanopi! ##########
2024-06-02 17:17:53.251 CEST [60185M] INFO: FTL branch: new/timezone
2024-06-02 17:17:53.252 CEST [60185M] INFO: FTL version: vDev-14ea246
2024-06-02 17:17:53.252 CEST [60185M] INFO: FTL commit: 14ea246f

@DL6ER DL6ER merged commit 9f8c4c2 into development-v6 Jun 2, 2024
17 checks passed
@DL6ER DL6ER deleted the new/timezone branch June 2, 2024 18:14
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.

2 participants