diff options
| -rw-r--r-- | src/mailman/docs/registration.txt | 1 | ||||
| -rw-r--r-- | src/mailman/docs/requests.txt | 9 | ||||
| -rw-r--r-- | src/mailman/email/message.py | 1 | ||||
| -rw-r--r-- | src/mailman/mta/deliver.py | 5 | ||||
| -rw-r--r-- | src/mailman/pipeline/docs/replybot.txt | 2 | ||||
| -rw-r--r-- | src/mailman/queue/docs/command.txt | 1 |
6 files changed, 4 insertions, 15 deletions
diff --git a/src/mailman/docs/registration.txt b/src/mailman/docs/registration.txt index a66544fc7..6b1ff0c18 100644 --- a/src/mailman/docs/registration.txt +++ b/src/mailman/docs/registration.txt @@ -158,7 +158,6 @@ message is sent to the user in order to verify the registered address. >>> dump_msgdata(qdata) _parsemsg : False nodecorate : True - original_size : ... recipients : [u'aperson@example.com'] reduced_list_headers: True version : 3 diff --git a/src/mailman/docs/requests.txt b/src/mailman/docs/requests.txt index 1bf981859..5dcfa922a 100644 --- a/src/mailman/docs/requests.txt +++ b/src/mailman/docs/requests.txt @@ -299,7 +299,6 @@ The message can be rejected, meaning it is bounced back to the sender. _parsemsg : False listname : alist@example.com nodecorate : True - original_size : ... recipients : [u'aperson@example.org'] reduced_list_headers: True version : 3 @@ -405,7 +404,6 @@ moderators. _parsemsg : False listname : alist@example.com nodecorate : True - original_size : ... recipients : [u'zperson@example.com'] reduced_list_headers: True version : 3 @@ -476,7 +474,6 @@ queue when the message is held. _parsemsg : False listname : alist@example.com nodecorate : True - original_size : ... recipients : [u'alist-owner@example.com'] reduced_list_headers: True tomoderators : True @@ -532,7 +529,6 @@ subscriber. _parsemsg : False listname : alist@example.com nodecorate : True - original_size : ... recipients : [u'cperson@example.org'] reduced_list_headers: True version : 3 @@ -577,7 +573,6 @@ subscription and the fact that they may need to approve it. _parsemsg : False listname : alist@example.com nodecorate : True - original_size : ... recipients : [u'alist-owner@example.com'] reduced_list_headers: True tomoderators : True @@ -651,7 +646,6 @@ The welcome message is sent to the person who just subscribed. _parsemsg : False listname : alist@example.com nodecorate : True - original_size : ... recipients : [u'fperson@example.org'] reduced_list_headers: True verp : False @@ -758,7 +752,6 @@ unsubscription holds can send the list's moderators an immediate notification. _parsemsg : False listname : alist@example.com nodecorate : True - original_size : ... recipients : [u'alist-owner@example.com'] reduced_list_headers: True tomoderators : True @@ -817,7 +810,6 @@ and the person remains a member of the mailing list. _parsemsg : False listname : alist@example.com nodecorate : True - original_size : ... recipients : [u'hperson@example.com'] reduced_list_headers: True version : 3 @@ -873,7 +865,6 @@ The goodbye message... _parsemsg : False listname : alist@example.com nodecorate : True - original_size : ... recipients : [u'gperson@example.com'] reduced_list_headers: True verp : False diff --git a/src/mailman/email/message.py b/src/mailman/email/message.py index 73bc8c8be..458f4070c 100644 --- a/src/mailman/email/message.py +++ b/src/mailman/email/message.py @@ -207,7 +207,6 @@ class UserNotification(Message): recipients=self.recips, nodecorate=True, reduced_list_headers=True, - original_size=len(self.as_string()), ) if mlist is not None: enqueue_kws['listname'] = mlist.fqdn_listname diff --git a/src/mailman/mta/deliver.py b/src/mailman/mta/deliver.py index a3a32a0ff..2500faf49 100644 --- a/src/mailman/mta/deliver.py +++ b/src/mailman/mta/deliver.py @@ -95,12 +95,15 @@ def deliver(mlist, msg, msgdata): refused = agent.deliver(mlist, msg, msgdata) t1 = time.time() # Log this posting. + size = getattr(msg, 'original_size', msgdata.get('original_size')) + if size is None: + size = len(msg.as_string()) substitutions = dict( msgid = msg.get('message-id', 'n/a'), listname = mlist.fqdn_listname, sender = original_sender, recip = len(original_recipients), - size = msg.original_size, + size = size, time = t1 - t0, refused = len(refused), smtpcode = 'n/a', diff --git a/src/mailman/pipeline/docs/replybot.txt b/src/mailman/pipeline/docs/replybot.txt index 7d0db010c..f02b90254 100644 --- a/src/mailman/pipeline/docs/replybot.txt +++ b/src/mailman/pipeline/docs/replybot.txt @@ -49,7 +49,6 @@ response. _parsemsg : False listname : _xtest@example.com nodecorate : True - original_size : ... recipients : [u'aperson@example.com'] reduced_list_headers: True version : 3 @@ -138,7 +137,6 @@ header is ignored. _parsemsg : False listname : _xtest@example.com nodecorate : True - original_size : ... recipients : [u'asystem@example.com'] reduced_list_headers: True version : 3 diff --git a/src/mailman/queue/docs/command.txt b/src/mailman/queue/docs/command.txt index 7c989ac67..88e4387d4 100644 --- a/src/mailman/queue/docs/command.txt +++ b/src/mailman/queue/docs/command.txt @@ -62,7 +62,6 @@ And now the response is in the virgin queue. _parsemsg : False listname : test@example.com nodecorate : True - original_size : 532 recipients : [u'aperson@example.com'] reduced_list_headers: True version : ... |