From a2cf98449c8e176e8534eb961043f6eac918ce2b Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sat, 27 Aug 2022 04:37:55 -0700 Subject: [PATCH] =?utf8?q?[3.10]=20gh-92007:=20Handle=20elevation=20errors?= =?utf8?q?=20in=20NTEventLogHandler=20more=20grace=E2=80=A6=20(GH-96322)?= =?utf8?q?=20(GH-96338)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Lib/logging/handlers.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index 32c04202c5aa..f0fdedae5ebb 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -1098,7 +1098,16 @@ class NTEventLogHandler(logging.Handler): dllname = os.path.join(dllname[0], r'win32service.pyd') self.dllname = dllname self.logtype = logtype - self._welu.AddSourceToRegistry(appname, dllname, logtype) + # Administrative privileges are required to add a source to the registry. + # This may not be available for a user that just wants to add to an + # existing source - handle this specific case. + try: + self._welu.AddSourceToRegistry(appname, dllname, logtype) + except Exception as e: + # This will probably be a pywintypes.error. Only raise if it's not + # an "access denied" error, else let it pass + if getattr(e, 'winerror', None) != 5: # not access denied + raise self.deftype = win32evtlog.EVENTLOG_ERROR_TYPE self.typemap = { logging.DEBUG : win32evtlog.EVENTLOG_INFORMATION_TYPE, -- 2.47.3