瀏覽代碼

[fix] login limit exceeded

version-14
Anand Doshi 10 年之前
父節點
當前提交
eac7619d72
共有 1 個文件被更改,包括 12 次插入1 次删除
  1. +12
    -1
      frappe/email/receive.py

+ 12
- 1
frappe/email/receive.py 查看文件

@@ -93,6 +93,14 @@ class POP3Server:
if num > 100 and not self.errors:
for m in xrange(101, num+1):
self.pop.dele(m)

except Exception, e:
if self.has_login_limit_exceeded(e):
pass

else:
raise

finally:
# no matter the exception, pop should quit if connected
self.pop.quit()
@@ -113,7 +121,7 @@ class POP3Server:
raise

except Exception, e:
if "-ERR Exceeded the login limit" in strip(cstr(e.message)):
if self.has_login_limit_exceeded(e):
self.errors = True
raise LoginLimitExceeded, e

@@ -127,6 +135,9 @@ class POP3Server:
else:
self.pop.dele(msg_num)

def has_login_limit_exceeded(self, e):
return "-ERR Exceeded the login limit" in strip(cstr(e.message))

def validate_pop(self, pop_meta):
# throttle based on email size
if not self.max_email_size:


Loading…
取消
儲存