Skip to content

Commit 85c1909

Browse files
committed
Exception handling now raises KeyboardInterrupt and SystemExit rather than passing to handleError
1 parent ab0f947 commit 85c1909

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

Lib/logging/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,8 @@ def emit(self, record):
738738
except UnicodeError:
739739
self.stream.write(fs % msg.encode("UTF-8"))
740740
self.flush()
741+
except (KeyboardInterrupt, SystemExit):
742+
raise
741743
except:
742744
self.handleError(record)
743745

Lib/logging/handlers.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ def emit(self, record):
7171
if self.shouldRollover(record):
7272
self.doRollover()
7373
logging.FileHandler.emit(self, record)
74+
except (KeyboardInterrupt, SystemExit):
75+
raise
7476
except:
7577
self.handleError(record)
7678

@@ -418,6 +420,8 @@ def emit(self, record):
418420
try:
419421
s = self.makePickle(record)
420422
self.send(s)
423+
except (KeyboardInterrupt, SystemExit):
424+
raise
421425
except:
422426
self.handleError(record)
423427

@@ -639,6 +643,8 @@ def emit(self, record):
639643
self.socket.send(msg)
640644
else:
641645
self.socket.sendto(msg, self.address)
646+
except (KeyboardInterrupt, SystemExit):
647+
raise
642648
except:
643649
self.handleError(record)
644650

0 commit comments

Comments
 (0)