From f4beb81195076e7c4de692cc6a09576cabeeab47 Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Sun, 7 Jun 2020 12:46:59 +0200
Subject: [PATCH] refactor load_pgp_public_keys

---
 email_handler.py |  2 +-
 init_app.py      | 23 ++++++++++-------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/email_handler.py b/email_handler.py
index 63aa9661..f9868635 100644
--- a/email_handler.py
+++ b/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)
diff --git a/init_app.py b/init_app.py
index 54bb1239..22389fc2 100644
--- a/init_app.py
+++ b/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()