seba
/
ether2any
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added IMAP Idle Support + performance hacks

This commit is contained in:
Sebastian Lohff 2011-11-17 23:20:08 +01:00
parent 5cbd187da3
commit 5f5e9e8327
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tunnel/spam/spam.py
View File

@ -52,7 +52,9 @@ class NetMailHandler():
# Seem to occure only when smtplib sends (long) mails to smtpd # Seem to occure only when smtplib sends (long) mails to smtpd
text = text.replace("\n ", "") text = text.replace("\n ", "")
try: try:
#tmpTime = time.time()
data = self.generator.decode(text) data = self.generator.decode(text)
#print "DECODE", time.time() - tmpTime
except DecodingException, e: except DecodingException, e:
print "Error: Could not decode text! See error below" print "Error: Could not decode text! See error below"
print " < ----------- 8< ----------- > " print " < ----------- 8< ----------- > "
@ -108,11 +110,14 @@ class SimpleIMAPClient(threading.Thread):
print "Error!" print "Error!"
def fetchNewMailToDev(self): def fetchNewMailToDev(self):
t = time.time()
decTime = 0.0
l = self.imap.search(None, 'UNSEEN') l = self.imap.search(None, 'UNSEEN')
newMsgIds = l[1][0].replace(" ", ",") newMsgIds = l[1][0].replace(" ", ",")
if newMsgIds == '': if newMsgIds == '':
return False return False
msgs = self.imap.fetch(newMsgIds, '(RFC822)') msgs = self.imap.fetch(newMsgIds, '(RFC822)')
print "Imap: Found %d new messages" % len(newMsgIds.split(",")), "Fetch done:", time.time()-t
for msg in msgs[1]: for msg in msgs[1]:
if msg == ")": if msg == ")":
# where does this come from...? # where does this come from...?
@ -121,7 +126,15 @@ class SimpleIMAPClient(threading.Thread):
print "Warning: Message broken, %d values in list, text '%s'" % (len(msg), msg) print "Warning: Message broken, %d values in list, text '%s'" % (len(msg), msg)
continue continue
(flags, data) = msg (flags, data) = msg
tmpTime = time.time()
self.handler.receiveMail(None, self.mailTo, data) self.handler.receiveMail(None, self.mailTo, data)
decTime += time.time() - tmpTime
#print "\t Recvd mail", time.time()-t, "decoding", decTime, "non acc", time.time() - tmpTime
if self.imapConf['deleteAfterwards']:
for msgid in newMsgIds.split(","):
self.imap.store(msgid, "+FLAGS", r"\DELETED")
self.imap.expunge()
print "Processing of %d messages in %fs (decoding took %fs)" % (len(newMsgIds.split(",")), time.time()-t, decTime)
return (len(msgs) > 0) return (len(msgs) > 0)
def run(self): def run(self):
@ -138,7 +151,6 @@ class SimpleIMAPClient(threading.Thread):
time.sleep(self.imapConf['mailWait'][tries]) time.sleep(self.imapConf['mailWait'][tries])
tries += 1 tries += 1
# go into idle mode # go into idle mode
# NOT IMPLEMENTED
if self.imapConf['useIDLE']: if self.imapConf['useIDLE']:
print "Going into IDLE mode..." print "Going into IDLE mode..."
self.idleTagNum += 1 self.idleTagNum += 1
@ -202,11 +214,14 @@ class MailTunnel(Ether2Any):
e['Subject'] = subject e['Subject'] = subject
e['From'] = fromAddr e['From'] = fromAddr
e['To'] = ",\n".join(toAddrs) e['To'] = ",\n".join(toAddrs)
t = time.time()
try: try:
self.smtp.sendmail(fromAddr, toAddrs, e.as_string()) self.smtp.sendmail(fromAddr, toAddrs, e.as_string())
#print "Mail took %fs" % (time.time()-t)
except smtplib.SMTPServerDisconnected: except smtplib.SMTPServerDisconnected:
self.connectSMTP() self.connectSMTP()
self.smtp.sendmail(fromAddr, toAddrs, e.as_string()) self.smtp.sendmail(fromAddr, toAddrs, e.as_string())
print "Mail+reconnect took %fs" % (time.time()-t)
def sendToNet(self, packet): def sendToNet(self, packet):
data = self.generator.encode(packet) data = self.generator.encode(packet)
@ -230,5 +245,8 @@ class MailTunnel(Ether2Any):
if __name__ == '__main__': if __name__ == '__main__':
mailtun = MailTunnel() mailtun = MailTunnel()
import cProfile
#p = cProfile.run('mailtun.run()')
#p.sort_stats('time', 'cum').print_stats(.5, 'init')
mailtun.run() mailtun.run()