Improve error handling in SMTP email logging

Refactor email message handling in SMTP logging to ensure proper cleanup and error handling.

Author: MazinSharaf

Lib/logging/handlers.py

@@ -1121,36 +1121,43 @@ def emit(self, record):
             if not port:
                 port = smtplib.SMTP_PORT
             smtp = smtplib.SMTP(self.mailhost, port, timeout=self.timeout)
-            msg = EmailMessage()
-            msg['From'] = self.fromaddr
-            msg['To'] = ','.join(self.toaddrs)
-            msg['Subject'] = self.getSubject(record)
-            msg['Date'] = email.utils.localtime()
-            msg.set_content(self.format(record))
-            if self.username:
-                if self.secure is not None:
-                    import ssl
-
-                    try:
-                        keyfile = self.secure[0]
-                    except IndexError:
-                        keyfile = None
-
-                    try:
-                        certfile = self.secure[1]
-                    except IndexError:
-                        certfile = None
-
-                    context = ssl._create_stdlib_context(
-                        certfile=certfile, keyfile=keyfile
-                    )
-                    smtp.ehlo()
-                    smtp.starttls(context=context)
-                    smtp.ehlo()
-                smtp.login(self.username, self.password)
-            smtp.send_message(msg)
-            smtp.quit()
-        except Exception:
+            try:
+                msg = EmailMessage()
+                msg['From'] = self.fromaddr
+                msg['To'] = ','.join(self.toaddrs)
+                msg['Subject'] = self.getSubject(record)
+                msg['Date'] = email.utils.localtime()
+                msg.set_content(self.format(record))
+                if self.username:
+                    if self.secure is not None:
+                        import ssl
+    
+                        try:
+                            keyfile = self.secure[0]
+                        except IndexError:
+                            keyfile = None
+    
+                        try:
+                            certfile = self.secure[1]
+                        except IndexError:
+                            certfile = None
+    
+                        context = ssl._create_stdlib_context(
+                            certfile=certfile, keyfile=keyfile
+                        )
+                        smtp.ehlo()
+                        smtp.starttls(context=context)
+                        smtp.ehlo()
+                    smtp.login(self.username, self.password)
+                smtp.send_message(msg)
+                smtp.quit()
+            except Exception:
+                try:
+                    smtp.close()
+                except Exception:
+                    pass
+                raise
+        except Exception:    
             self.handleError(record)
 
 class NTEventLogHandler(logging.Handler):