paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Dovecot] Fix type of last_notification

master
andryyy 2019-01-31 20:53:08 +01:00
parent 24432b0d9d
commit 3aef412669
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/Dockerfiles/dovecot/quarantine_notify.py
View File

@ -40,7 +40,7 @@ def query_mysql(query, headers = True, update = False):
result = [] result = []
columns = tuple( [d[0].decode('utf8') for d in cur.description] ) columns = tuple( [d[0].decode('utf8') for d in cur.description] )
for row in cur: for row in cur:
if headers: if headers:
result.append(dict(zip(columns, row))) result.append(dict(zip(columns, row)))
else: else:
result.append(row) result.append(row)
@ -94,7 +94,7 @@ def notify_rcpt(rcpt, msg_count):
records = query_mysql('SELECT count(id) AS counter, rcpt FROM quarantine WHERE notified = 0 GROUP BY rcpt') records = query_mysql('SELECT count(id) AS counter, rcpt FROM quarantine WHERE notified = 0 GROUP BY rcpt')
for record in records: for record in records:
last_notification = int(r.hget('Q_LAST_NOTIFIED', record['rcpt'])) or 0 last_notification = int(r.hget('Q_LAST_NOTIFIED', record['rcpt']) or 0)
attrs_json = query_mysql('SELECT attributes FROM mailbox WHERE username = "%s"' % (record['rcpt'])) attrs_json = query_mysql('SELECT attributes FROM mailbox WHERE username = "%s"' % (record['rcpt']))
attrs = json.loads(str(attrs_json[0]['attributes'])) attrs = json.loads(str(attrs_json[0]['attributes']))
if attrs['quarantine_notification'] == 'hourly': if attrs['quarantine_notification'] == 'hourly':

2
docker-compose.yml
View File

@ -164,7 +164,7 @@ services:
- sogo - sogo
dovecot-mailcow: dovecot-mailcow:
image: mailcow/dovecot:1.56 image: mailcow/dovecot:1.57
build: ./data/Dockerfiles/dovecot build: ./data/Dockerfiles/dovecot
cap_add: cap_add:
- NET_BIND_SERVICE - NET_BIND_SERVICE