From 19a475199aa6d0b7b8e1cfd1b912451a792767d1 Mon Sep 17 00:00:00 2001 From: Michael Zhang Date: Tue, 12 Jan 2016 22:41:59 -0600 Subject: [PATCH] add more logs --- ctf.nginx | 2 +- server/api/logger.py | 45 ++++++++++++++++++-------------------------- web/pages/team.html | 10 ++++++---- 3 files changed, 25 insertions(+), 32 deletions(-) diff --git a/ctf.nginx b/ctf.nginx index dff29d7..7d71a7d 100644 --- a/ctf.nginx +++ b/ctf.nginx @@ -18,7 +18,7 @@ server { default_type text/html; try_files /index.html /index.html; } - location ~^/admin/(problems)$ { + location ~^/admin/(problems|settings|stats|teams)$ { default_type text/html; try_files /index.html /index.html; } diff --git a/server/api/logger.py b/server/api/logger.py index 7829286..3923c5a 100644 --- a/server/api/logger.py +++ b/server/api/logger.py @@ -2,6 +2,9 @@ import datetime import logging import logging.handlers import os +import pkgutil + +import api NOTSET = 0 DEBUG = 10 @@ -11,33 +14,21 @@ ERROR = 40 CRITICAL = 50 def initialize_logs(): - registration_logger = logging.getLogger("registrations") - login_logger = logging.getLogger("logins") - submission_logger = logging.getLogger("submissions") + def create_logger(name): + new_logger = logging.getLogger(name) + new_logger.setLevel(logging.INFO) - registration_logger.setLevel(logging.INFO) - login_logger.setLevel(logging.INFO) - submission_logger.setLevel(logging.INFO) + base = os.path.dirname(__file__).strip("api") + log_path = os.path.join(base, "logs") + if not os.path.exists(log_path): + os.mkdir(log_path) - base = os.path.dirname(__file__).strip("api") - log_path = os.path.join(base, "logs") + log_handler = logging.handlers.RotatingFileHandler(os.path.join(log_path, name + ".log")) + new_logger.addHandler(log_handler) + for importer, modname, ispkg in pkgutil.walk_packages(path="../api"): + create_logger(modname) - if not os.path.exists(log_path): - os.mkdir(log_path) - - # logs = [os.path.join(log_path, "registrations.log"), os.path.join(log_path, "logins.log"), os.path.join(log_path, "submissions.log")] - logs = map(lambda x: os.path.join(log_path, x + ".log"), \ - [ "registrations", "logins", "submissions", "create_team" ]) - - registration_log = logging.handlers.RotatingFileHandler(logs[0], maxBytes=10000) - login_log = logging.handlers.RotatingFileHandler(logs[1], maxBytes=10000) - submission_log = logging.handlers.RotatingFileHandler(logs[2], maxBytes=10000) - - registration_logger.addHandler(registration_log) - login_logger.addHandler(login_log) - submission_logger.addHandler(submission_log) - -def log(log, level, message): - logger = logging.getLogger(log) - message = "[%s] %s" % (datetime.datetime.now().strftime("%m/%d/%Y %X"), message) - logger.log(level, message) +def log(logname, level, message): + logger = logging.getLogger(logname) + message = "[%s] %s" % (datetime.datetime.now().strftime("%m/%d/%Y %X"), message) + logger.log(level, message) \ No newline at end of file diff --git a/web/pages/team.html b/web/pages/team.html index 2b444b3..4f8002b 100644 --- a/web/pages/team.html +++ b/web/pages/team.html @@ -1,7 +1,5 @@