Merge ~robru/britney/+git/britney2-ubuntu:write-email-cache-often into ~ubuntu-release/britney/+git/britney2-ubuntu:master

[Robert Bruce Park]

Drop asserts that could crash britney, and write sent email cache after every email sent, thus preventing future cases of "britney is spamming mails because it's crashing before it can write it's email cache".

[Steve Langasek (vorlon)]

The only thing I see that stands out is that you are writing a log entry each time you call save_state(), and you are now calling save_state() for each email sent. That looks spammy to me. Could you either drop the log message, or write it out only the last time save_state() is called, with britney!=None?

review: Needs Fixing

[Robert Bruce Park (robru)]

Ok fixed, please merge.

diff --git a/britney2/policies/email.py b/britney2/policies/email.py
index 129d665..385a7ed 100644
--- a/britney2/policies/email.py
+++ b/britney2/policies/email.py
@@ -111,8 +111,8 @@ class EmailPolicy(BasePolicy, Rest):
             for line in details.splitlines():
                 parts = line.split(':')
                 if parts[0] == 'info':
-                    assert int(parts[1]) == 1  # Version
-                    assert int(parts[2]) <= 1  # Count
+                    if int(parts[1]) != 1 or int(parts[2]) > 1:
+                        break
                 if parts[0] == 'uid':
                     flags = parts[4]
                     if 'e' in flags or 'r' in flags:
@@ -185,12 +185,14 @@ class EmailPolicy(BasePolicy, Rest):
                     self.log("Failed to send mail! Is SMTP server running?")
                     self.log(err)
         self.emails_by_pkg[source_name][version] = sent
+        self.save_state()
         return PolicyVerdict.PASS
 
-    def save_state(self, britney):
+    def save_state(self, britney=None):
         """Write source ppa data to disk"""
         tmp = self.filename + '.tmp'
         with open(tmp, 'w', encoding='utf-8') as data:
             json.dump(self.emails_by_pkg, data)
         os.rename(tmp, self.filename)
-        self.log("Wrote email data to %s" % self.filename)
+        if britney:
+            self.log("Wrote email data to %s" % self.filename)