Sysdeploy/influx-smtp-gateway
2
0
Fork 1
Code Issues Pull Requests 2 Projects Releases Wiki Activity

Updated the smtp client object handling logic by thread local client variable

Browse Source
This commit is contained in:
kuldeep.k@cisinlabs.com 2022-02-23 20:15:56 +05:30
parent f4fc89c111
commit ac8fe8261e
1 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
main.py
View File

@ -13,11 +13,18 @@ from email.mime.text import MIMEText
import cherrypy import cherrypy
import logging import logging
import threading
logging.basicConfig(stream=sys.stdout, logging.basicConfig(stream=sys.stdout,
format='%(name)s - %(levelname)s - %(message)s') format='%(name)s - %(levelname)s - %(message)s')
def soft_return(msg):
time.sleep(0.2)
return(msg)
class SMTPWebhookApp: class SMTPWebhookApp:
""" """
SMTP webhook server SMTP webhook server
@ -49,32 +56,48 @@ class SMTPWebhookApp:
body = req_body['body'] body = req_body['body']
to_mail = req_body['to_mail'] to_mail = req_body['to_mail']
try:
client = smtplib.SMTP(host=SMTP_SERVER_HOST, port=SMTP_SERVER_PORT)
except (smtplib.SMTPConnectionError, TimeoutError) as e:
time.sleep(0.2)
logging.error("To: {}, error: {}".format(to_mail, e))
return {"status": 400, "message": "SMTP client error: {}.".format(
e)}
msg = MIMEText(body, 'plain', 'utf-8') msg = MIMEText(body, 'plain', 'utf-8')
msg['Subject'] = Header(subject, 'utf-8') msg['Subject'] = Header(subject, 'utf-8')
msg['From'] = FROM_MAIL msg['From'] = FROM_MAIL
msg['To'] = to_mail msg['To'] = to_mail
c = 0
while (c < 2):
try: try:
client.ehlo() mythread.client.sendmail(msg['From'],
client.starttls() msg['To'], msg.as_string())
client.ehlo()
client.login(msg["From"], FROM_MAIL_PASSWORD)
client.sendmail(msg['From'], msg['To'], msg.as_string())
response = {"status": 200, "message": "mail sent successfully"} response = {"status": 200, "message": "mail sent successfully"}
logging.info("To: {}, mail sent successfully".format(to_mail)) except (AttributeError, ValueError,
smtplib.SMTPServerDisconnected):
if (c == 1):
soft_return("can't connect")
try:
print("- - - - - CREATING CLIENT - - - - -")
mythread.client = smtplib.SMTP(host=SMTP_SERVER_HOST,
port=SMTP_SERVER_PORT)
mythread.client.starttls()
except (smtplib.SMTPException, TimeoutError) as e:
soft_return("can't connect")
response = {"status": 500,
"message": "some error: {}".format(e)}
print("response1: ", response)
try:
mythread.client.login(msg["From"], FROM_MAIL_PASSWORD)
except smtplib.SMTPException as e: except smtplib.SMTPException as e:
time.sleep(0.2) soft_return(e)
logging.error("To: {}, error: {}".format(to_mail, e)) response = {"status": 500,
response = {"status": 500, "message": "some error: {}".format(e)} "message": "some error: {}".format(e)}
print("response2: ", response)
except smtplib.SMTPException as e:
soft_return("can't send for some reason")
response = {"status": 500,
"message": "some error: {}".format(e)}
print("response3: ", response)
finally: finally:
client.quit() c += 1
return response return response
@cherrypy.expose @cherrypy.expose
@ -89,7 +112,6 @@ class SMTPWebhookApp:
ROOT = SMTPWebhookApp() ROOT = SMTPWebhookApp()
SMTP_SERVER_PORT = 587 SMTP_SERVER_PORT = 587
CHERRYPY_SERVER_HOST = "0.0.0.0" CHERRYPY_SERVER_HOST = "0.0.0.0"
CHERRYPY_SERVER_PORT = 8081 CHERRYPY_SERVER_PORT = 8081
@ -109,6 +131,10 @@ if __name__ == "__main__":
ENGINE = cherrypy.engine ENGINE = cherrypy.engine
cherrypy.tree.mount(ROOT, config={}) cherrypy.tree.mount(ROOT, config={})
mythread = threading.local()
mythread.client = smtplib.SMTP(host=SMTP_SERVER_HOST,
port=SMTP_SERVER_PORT)
mythread.client.starttls()
if hasattr(ENGINE, "signal_handler"): if hasattr(ENGINE, "signal_handler"):
ENGINE.signal_handler.subscribe() ENGINE.signal_handler.subscribe()