Browse Source

feat: 记录日志

SongZihuan 2 years ago
parent
commit
bff236f25d
3 changed files with 19 additions and 3 deletions
  1. 2 2
      web/mailbox.py
  2. 2 0
      web/sender.py
  3. 15 1
      web/user.py

+ 2 - 2
web/mailbox.py

@@ -57,6 +57,7 @@ def __load_mailbox_page(mail_list, page, to_mail=None, date=None, select=None, n
     page_list = get_page("mailbox.mail_list_page", page, max_page, date=date, select=select)
     page_mail_list: List[Mail] = mail_list[(page - 1) * 10: page * 10]
 
+    Logger.print_load_page_log(f"mail-list date:{date} select:{select}")
     return render_template("mailbox/mailbox.html",
                            to_mail=to_mail,
                            date=date,
@@ -94,7 +95,6 @@ def mail_list_page():
         next_date = None
         last_date = None
 
-    Logger.print_load_page_log("mail list")
     return __load_mailbox_page(mail_list,
                                page,
                                date=date,
@@ -114,7 +114,6 @@ def __get_mail() -> (Mail, str, str, int):
     mail: Mail = current_user.get_mail(date_obj, select, mail_id)
     if not mail:
         abort(404)
-
     return mail, date, select, mail_id
 
 
@@ -168,6 +167,7 @@ def mail_page():
         elif type(i) is PLAIN:
             plain.append(i)
     file_list = mail.file_list
+    Logger.print_load_page_log(f"mail-{mail_id}")
     return render_template("mailbox/mail.html",
                            date=date,
                            select=select,

+ 2 - 0
web/sender.py

@@ -11,6 +11,7 @@ import re
 import smtplib
 
 from sender.email import Email
+from .logger import Logger
 
 sender = Blueprint("sender", __name__)
 
@@ -115,4 +116,5 @@ def send_page():
             else:
                 flash("发信成功")
         return redirect(url_for("sender.send_page"))
+    Logger.print_load_page_log("send")
     return render_template("sender/sender.html", form=form)

+ 15 - 1
web/user.py

@@ -7,6 +7,7 @@ from .configure import conf
 
 from flask_login import UserMixin
 from threading import Thread
+from .logger import Logger
 
 
 EXPIRE = conf["REDIS_EXPIRE"]
@@ -41,8 +42,15 @@ class User(UserMixin):
                         debug=False)
 
         if not imap.check_login():
+            Logger.print_user_opt_success_log("imap check login")
             return False
-        return sender.check_login()
+
+        if not sender.check_login():
+            Logger.print_user_opt_success_log("smtp check login")
+            return False
+
+        Logger.print_user_opt_success_log("check login")
+        return True
 
     @property
     def info(self):
@@ -84,6 +92,11 @@ class User(UserMixin):
                     except UnicodeDecodeError:
                         redis.set(name, b"")
                     redis.expire(name, EXPIRE)
+            except Exception:
+                Logger.print_user_opt_fail_log(f"thread load email")
+                raise
+            else:
+                Logger.print_user_opt_success_log(f"thread load email")
             finally:
                 redis.set(f"download:mutex:{self.username}", 0)
 
@@ -139,3 +152,4 @@ class User(UserMixin):
                         start_ssl=conf["SMTP_START_SSL"],
                         debug=False)
         sender.send(email)
+        Logger.print_user_opt_success_log("send email")