Browse Source

捕捉smtp异常

pull/26/head
ibuler 9 years ago
parent
commit
13d325e259
  1. 4
      install/install.py
  2. 2
      jumpserver.conf

4
install/install.py

@ -6,7 +6,7 @@ import time
import os import os
import sys import sys
import MySQLdb import MySQLdb
from smtplib import SMTP, SMTPAuthenticationError, SMTPConnectError from smtplib import SMTP, SMTPAuthenticationError, SMTPConnectError, SMTPSenderRefused
import ConfigParser import ConfigParser
import socket import socket
import fcntl import fcntl
@ -127,7 +127,7 @@ class PreSetup(object):
smtp.quit() smtp.quit()
return True return True
except (SMTPAuthenticationError, socket.timeout, socket.gaierror), e: except (SMTPAuthenticationError, socket.timeout, socket.gaierror, SMTPSenderRefused, SMTPConnectError), e:
color_print(e, 'red') color_print(e, 'red')
return False return False

2
jumpserver.conf

@ -19,5 +19,5 @@ email_host = smtp.qq.com
email_port = 25 email_port = 25
email_host_user = xxxxxxxx@qq.com email_host_user = xxxxxxxx@qq.com
email_host_password = xxxxxx email_host_password = xxxxxx
email_use_tls = True email_use_tls = False

Loading…
Cancel
Save