oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-09-15 20:36:55 +00:00
Code Wiki Activity

Merge pull request #1819 from pbiering/fix-1817

Browse source 
Fix for 1817
This commit is contained in:
Peter Bieringer 2025-07-08 18:07:59 +02:00 • committed by GitHub
commit a957871928
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -6,6 +6,7 @@
* Improve: add details about platform and effective user on startup * Improve: add details about platform and effective user on startup
* Improve: display owner+permissions on directories on startup, extend error message in case of missing permissions * Improve: display owner+permissions on directories on startup, extend error message in case of missing permissions
* Feature: add hook for server-side e-mail notification * Feature: add hook for server-side e-mail notification
* Fix: logging ignores not retrievable get_native_id if not supported by OS
## 3.5.4 ## 3.5.4
* Improve: item filter enhanced for 3rd level supporting VALARM and honoring TRIGGER (offset or absolute) * Improve: item filter enhanced for 3rd level supporting VALARM and honoring TRIGGER (offset or absolute)

8
radicale/log.py
View file

@ -77,7 +77,13 @@ class IdentLogRecordFactory:
ident += "/%s" % (record.threadName or "unknown") ident += "/%s" % (record.threadName or "unknown")
if (sys.version_info >= (3, 8) and if (sys.version_info >= (3, 8) and
record.thread == threading.get_ident()): record.thread == threading.get_ident()):
tid = threading.get_native_id() try:
tid = threading.get_native_id()
except AttributeError:
# so far function not existing e.g. on SunOS
# see also https://docs.python.org/3/library/threading.html#threading.get_native_id
tid = None
record.ident = ident # type:ignore[attr-defined] record.ident = ident # type:ignore[attr-defined]
record.tid = tid # type:ignore[attr-defined] record.tid = tid # type:ignore[attr-defined]
return record return record