pangea
/
django-orchestra
7
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

rewrite resource trafic mailman

This commit is contained in:
Jorge Pastor 2024-03-22 19:00:43 +01:00
parent c80295c277
commit ba1ceede15
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
orchestra/contrib/lists/backends.py
View File

@ -199,7 +199,7 @@ class MailmanTraffic(ServiceMonitor):
model = 'lists.List' model = 'lists.List'
resource = ServiceMonitor.TRAFFIC resource = ServiceMonitor.TRAFFIC
verbose_name = _("Mailman traffic") verbose_name = _("Mailman traffic")
script_executable = '/usr/bin/python' script_executable = '/usr/bin/python3'
monthly_sum_old_values = True monthly_sum_old_values = True
doc_settings = (settings, doc_settings = (settings,
('LISTS_MAILMAN_POST_LOG_PATH',) ('LISTS_MAILMAN_POST_LOG_PATH',)
@ -210,9 +210,10 @@ class MailmanTraffic(ServiceMonitor):
context = { context = {
'postlogs': str((postlog, postlog+'.1')), 'postlogs': str((postlog, postlog+'.1')),
'current_date': self.current_date.strftime("%Y-%m-%d %H:%M:%S %Z"), 'current_date': self.current_date.strftime("%Y-%m-%d %H:%M:%S %Z"),
'default_domain': settings.LISTS_DEFAULT_DOMAIN,
} }
self.append(textwrap.dedent("""\ self.append(textwrap.dedent("""\
import re
import subprocess import subprocess
import sys import sys
from datetime import datetime from datetime import datetime
@ -243,7 +244,6 @@ class MailmanTraffic(ServiceMonitor):
'Nov': '11', 'Nov': '11',
'Dec': '12', 'Dec': '12',
}} }}
mailman_addr = re.compile(r'.*-(admin|bounces|confirm|join|leave|owner|request|subscribe|unsubscribe)@.*|mailman@.*')
def prepare(object_id, list_name, ini_date): def prepare(object_id, list_name, ini_date):
global lists global lists
@ -257,37 +257,34 @@ class MailmanTraffic(ServiceMonitor):
with open(postlog, 'r') as postlog: with open(postlog, 'r') as postlog:
for line in postlog.readlines(): for line in postlog.readlines():
line = line.split() line = line.split()
if len(line) < 11: if not 'bytes' in line:
continue continue
month, day, time, year, __, __, __, list_name, __, addr, size = line[:11] month, day, time, year, __, __, __, __, list_name, __, addr, size = line[:12]
try: try:
list_name = list_name.split('@')[0]
list = lists[list_name] list = lists[list_name]
except KeyError: except KeyError:
continue continue
else: else:
# discard mailman messages because of inconsistent POST logging
if mailman_addr.match(addr):
continue
date = year + months[month] + day + time.replace(':', '') date = year + months[month] + day + time.replace(':', '')
if list[0] < int(date) < end_date: if list[0] < int(date) < end_date:
size = size[5:-1]
try:
list[2] += int(size) list[2] += int(size)
except ValueError:
# anonymized post
pass
except IOError as e: except IOError as e:
sys.stderr.write(str(e)+'\\n') sys.stderr.write(str(e)+'\\n')
for list_name, opts in lists.items(): for list_name, opts in lists.items():
__, object_id, size = opts __, object_id, size = opts
if size: if size:
cmd = ' '.join(('list_members', list_name, '| wc -l')) cmd = f'runuser -u mailman3 -- /opt/mailman/venv/bin/mailman members {{list_name}}@{default_domain} | wc -l'
try:
ps = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) ps = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
subscribers = ps.communicate()[0].strip() subscribers = ps.communicate()[0].strip()
size *= int(subscribers) size *= int(subscribers)
sys.stderr.write("%s %s*%s traffic*subscribers\\n" % (object_id, size, subscribers)) sys.stderr.write("%s %s*%s traffic*subscribers\\n" % (object_id, size, int(subscribers)))
print object_id, size except:
pass
print(object_id, size)
""").format(**context) """).format(**context)
) )