refactor load_pgp_public_keys

email_handler.py

@@ -1076,7 +1076,7 @@ if __name__ == "__main__":
         LOG.warning("LOAD PGP keys")
         app = create_app()
         with app.app_context():
-            load_pgp_public_keys(app)
+            load_pgp_public_keys()
 
     while True:
         time.sleep(2)

init_app.py

@@ -6,21 +6,18 @@ from app.pgp_utils import load_public_key
 from server import create_app
 
 
-def load_pgp_public_keys(app):
+def load_pgp_public_keys():
     """Load PGP public key to keyring"""
-    with app.app_context():
-        for mailbox in Mailbox.query.filter(Mailbox.pgp_public_key != None).all():
-            LOG.d("Load PGP key for mailbox %s", mailbox)
-            fingerprint = load_public_key(mailbox.pgp_public_key)
+    for mailbox in Mailbox.query.filter(Mailbox.pgp_public_key != None).all():
+        LOG.d("Load PGP key for mailbox %s", mailbox)
+        fingerprint = load_public_key(mailbox.pgp_public_key)
 
-            # sanity check
-            if fingerprint != mailbox.pgp_finger_print:
-                LOG.error(
-                    "fingerprint %s different for mailbox %s", fingerprint, mailbox
-                )
-                mailbox.pgp_finger_print = fingerprint
+        # sanity check
+        if fingerprint != mailbox.pgp_finger_print:
+            LOG.error("fingerprint %s different for mailbox %s", fingerprint, mailbox)
+            mailbox.pgp_finger_print = fingerprint
 
-        db.session.commit()
+    db.session.commit()
 
     LOG.d("Finish load_pgp_public_keys")
 
@@ -29,4 +26,4 @@ if __name__ == "__main__":
     app = create_app()
 
     with app.app_context():
-        load_pgp_public_keys(app)
+        load_pgp_public_keys()