General Logging
some extra logging around problem areas
This commit is contained in:
parent
87384c1b98
commit
8aec4a45d2
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@ locale.xml
|
|||||||
app/luclient/*
|
app/luclient/*
|
||||||
app/cache/*
|
app/cache/*
|
||||||
property_files/*
|
property_files/*
|
||||||
|
*.log
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import os
|
import os
|
||||||
from flask import Flask, url_for, g, redirect
|
from flask import Flask, url_for, g, redirect, render_template
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
from flask_assets import Environment
|
from flask_assets import Environment
|
||||||
from webassets import Bundle
|
from webassets import Bundle
|
||||||
@ -7,7 +7,7 @@ import time
|
|||||||
from app.models import db, migrate, PlayKey
|
from app.models import db, migrate, PlayKey
|
||||||
from app.schemas import ma
|
from app.schemas import ma
|
||||||
from app.forms import CustomUserManager
|
from app.forms import CustomUserManager
|
||||||
from flask_user import user_registered, current_user
|
from flask_user import user_registered, current_user, user_logged_in
|
||||||
from flask_wtf.csrf import CSRFProtect
|
from flask_wtf.csrf import CSRFProtect
|
||||||
from flask_apscheduler import APScheduler
|
from flask_apscheduler import APScheduler
|
||||||
from app.luclient import query_cdclient, register_luclient_jinja_helpers
|
from app.luclient import query_cdclient, register_luclient_jinja_helpers
|
||||||
@ -15,6 +15,11 @@ from app.luclient import query_cdclient, register_luclient_jinja_helpers
|
|||||||
from app.commands import init_db, init_accounts, load_property, gen_image_cache, gen_model_cache
|
from app.commands import init_db, init_accounts, load_property, gen_image_cache, gen_model_cache
|
||||||
from app.models import Account, AccountInvitation
|
from app.models import Account, AccountInvitation
|
||||||
|
|
||||||
|
import logging
|
||||||
|
from logging.handlers import RotatingFileHandler
|
||||||
|
|
||||||
|
from werkzeug.exceptions import HTTPException
|
||||||
|
|
||||||
# Instantiate Flask extensions
|
# Instantiate Flask extensions
|
||||||
csrf_protect = CSRFProtect()
|
csrf_protect = CSRFProtect()
|
||||||
scheduler = APScheduler()
|
scheduler = APScheduler()
|
||||||
@ -22,7 +27,6 @@ scheduler = APScheduler()
|
|||||||
|
|
||||||
|
|
||||||
def create_app():
|
def create_app():
|
||||||
|
|
||||||
app = Flask(__name__, instance_relative_config=True)
|
app = Flask(__name__, instance_relative_config=True)
|
||||||
|
|
||||||
# decrement uses on a play key after a successful registration
|
# decrement uses on a play key after a successful registration
|
||||||
@ -33,8 +37,19 @@ def create_app():
|
|||||||
play_key_used = PlayKey.query.filter(PlayKey.id == user.play_key_id).first()
|
play_key_used = PlayKey.query.filter(PlayKey.id == user.play_key_id).first()
|
||||||
play_key_used.key_uses = play_key_used.key_uses - 1
|
play_key_used.key_uses = play_key_used.key_uses - 1
|
||||||
play_key_used.times_used = play_key_used.times_used + 1
|
play_key_used.times_used = play_key_used.times_used + 1
|
||||||
|
app.logger.info(
|
||||||
|
f"USERS::REGISTRATION User with ID {user.id} and name {user.username} Registered \
|
||||||
|
using Play Key ID {play_key_used.id} : {play_key_used.key_string}"
|
||||||
|
)
|
||||||
db.session.add(play_key_used)
|
db.session.add(play_key_used)
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
else:
|
||||||
|
app.logger.info(f"USERS::REGISTRATION User with ID {user.id} and name {user.username} Registered")
|
||||||
|
|
||||||
|
|
||||||
|
@user_logged_in.connect_via(app)
|
||||||
|
def _after_login_hook(sender, user, **extra):
|
||||||
|
app.logger.info(f"{user.username} Logged in")
|
||||||
|
|
||||||
# A bunch of jinja filters to make things easiers
|
# A bunch of jinja filters to make things easiers
|
||||||
@app.template_filter('ctime')
|
@app.template_filter('ctime')
|
||||||
@ -51,15 +66,24 @@ def create_app():
|
|||||||
else:
|
else:
|
||||||
return 0 & (1 << bit)
|
return 0 & (1 << bit)
|
||||||
|
|
||||||
|
@app.template_filter('debug')
|
||||||
|
def debug(text):
|
||||||
|
print(text)
|
||||||
|
|
||||||
@app.teardown_appcontext
|
@app.teardown_appcontext
|
||||||
def close_connection(exception):
|
def close_connection(exception):
|
||||||
cdclient = getattr(g, '_cdclient', None)
|
cdclient = getattr(g, '_cdclient', None)
|
||||||
if cdclient is not None:
|
if cdclient is not None:
|
||||||
cdclient.close()
|
cdclient.close()
|
||||||
|
|
||||||
@app.template_filter('debug')
|
@app.errorhandler(Exception)
|
||||||
def debug(text):
|
def handle_exception(e):
|
||||||
print(text)
|
app.logger.error(e)
|
||||||
|
# pass through HTTP errors
|
||||||
|
if isinstance(e, HTTPException):
|
||||||
|
return e
|
||||||
|
# now you're handling non-HTTP exceptions only
|
||||||
|
return render_template("status_codes/500.html.j2", exception=e), 500
|
||||||
|
|
||||||
# add the commands to flask cli
|
# add the commands to flask cli
|
||||||
app.cli.add_command(init_db)
|
app.cli.add_command(init_db)
|
||||||
@ -68,6 +92,7 @@ def create_app():
|
|||||||
app.cli.add_command(gen_image_cache)
|
app.cli.add_command(gen_image_cache)
|
||||||
app.cli.add_command(gen_model_cache)
|
app.cli.add_command(gen_model_cache)
|
||||||
|
|
||||||
|
register_logging(app)
|
||||||
register_settings(app)
|
register_settings(app)
|
||||||
register_extensions(app)
|
register_extensions(app)
|
||||||
register_blueprints(app)
|
register_blueprints(app)
|
||||||
@ -132,6 +157,14 @@ def register_blueprints(app):
|
|||||||
app.register_blueprint(reports_blueprint, url_prefix='/reports')
|
app.register_blueprint(reports_blueprint, url_prefix='/reports')
|
||||||
|
|
||||||
|
|
||||||
|
def register_logging(app):
|
||||||
|
# file logger
|
||||||
|
file_handler = RotatingFileHandler('nexus_dashboard.log', maxBytes=1024 * 1024 * 100, backupCount=20)
|
||||||
|
file_handler.setLevel(logging.INFO)
|
||||||
|
formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
|
||||||
|
file_handler.setFormatter(formatter)
|
||||||
|
app.logger.addHandler(file_handler)
|
||||||
|
|
||||||
|
|
||||||
def register_settings(app):
|
def register_settings(app):
|
||||||
"""Register setting from setting and env
|
"""Register setting from setting and env
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
from flask import render_template, Blueprint, redirect, url_for, request, abort, current_app, flash
|
from flask import render_template, Blueprint, redirect, url_for, request, abort, current_app, flash, current_app
|
||||||
from flask_user import login_required, current_user
|
from flask_user import login_required, current_user
|
||||||
import json
|
import json
|
||||||
from datatables import ColumnDT, DataTables
|
from datatables import ColumnDT, DataTables
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
from flask import render_template, Blueprint, redirect, url_for, request, abort, flash, request
|
from flask import render_template, Blueprint, redirect, url_for, request, abort, flash, request, current_app
|
||||||
from flask_user import login_required, current_user
|
from flask_user import login_required, current_user
|
||||||
from app.models import db, CharacterInfo, Account, CharacterXML, Reports
|
from app.models import db, CharacterInfo, Account, CharacterXML, Reports
|
||||||
from app import gm_level, scheduler
|
from app import gm_level, scheduler
|
||||||
@ -37,13 +37,15 @@ def uscore_by_date(date):
|
|||||||
|
|
||||||
@scheduler.task("cron", id="gen_item_report", hour=23)
|
@scheduler.task("cron", id="gen_item_report", hour=23)
|
||||||
def gen_item_report():
|
def gen_item_report():
|
||||||
|
try:
|
||||||
|
current_app.logger.info("Start Item Report Generation")
|
||||||
with scheduler.app.app_context():
|
with scheduler.app.app_context():
|
||||||
date = datetime.date.today().strftime('%Y-%m-%d')
|
date = datetime.date.today().strftime('%Y-%m-%d')
|
||||||
report = Reports.query.filter(Reports.date==date).filter(Reports.report_type=="items").first()
|
report = Reports.query.filter(Reports.date==date).filter(Reports.report_type=="items").first()
|
||||||
|
|
||||||
# Only one report per day
|
# Only one report per day
|
||||||
if report != None:
|
if report != None:
|
||||||
return f"Item Report Already Generated for {date}"
|
current_app.logger.info(f"Item Report Already Generated for {date}")
|
||||||
|
|
||||||
char_xmls = CharacterXML.query.join(
|
char_xmls = CharacterXML.query.join(
|
||||||
CharacterInfo,
|
CharacterInfo,
|
||||||
@ -75,19 +77,23 @@ def gen_item_report():
|
|||||||
)
|
)
|
||||||
|
|
||||||
new_report.save()
|
new_report.save()
|
||||||
|
current_app.logger.info(f"Generated Item Report for {date}")
|
||||||
return f"Generated Item Report for {date}"
|
except Exception as e:
|
||||||
|
current_app.logger.critical(f"REPORT::ITEMS - {e}")
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
@scheduler.task("cron", id="gen_currency_report", hour=23)
|
@scheduler.task("cron", id="gen_currency_report", hour=23)
|
||||||
def gen_currency_report():
|
def gen_currency_report():
|
||||||
|
try:
|
||||||
|
current_app.logger.info("Start Currency Report Generation")
|
||||||
with scheduler.app.app_context():
|
with scheduler.app.app_context():
|
||||||
date = datetime.date.today().strftime('%Y-%m-%d')
|
date = datetime.date.today().strftime('%Y-%m-%d')
|
||||||
report = Reports.query.filter(Reports.date==date).filter(Reports.report_type=="currency").first()
|
report = Reports.query.filter(Reports.date==date).filter(Reports.report_type=="currency").first()
|
||||||
|
|
||||||
# Only one report per day
|
# Only one report per day
|
||||||
if report != None:
|
if report != None:
|
||||||
return f"Currency Report Already Generated for {date}"
|
current_app.logger.info(f"Currency Report Already Generated for {date}")
|
||||||
|
|
||||||
characters = CharacterXML.query.join(
|
characters = CharacterXML.query.join(
|
||||||
CharacterInfo,
|
CharacterInfo,
|
||||||
@ -113,19 +119,23 @@ def gen_currency_report():
|
|||||||
)
|
)
|
||||||
|
|
||||||
new_report.save()
|
new_report.save()
|
||||||
|
current_app.logger.info(f"Generated Currency Report for {date}")
|
||||||
return f"Generated Currency Report for {date}"
|
except Exception as e:
|
||||||
|
current_app.logger.critical(f"REPORT::CURRENCY - {e}")
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
@scheduler.task("cron", id="gen_uscore_report", hour=23)
|
@scheduler.task("cron", id="gen_uscore_report", hour=23)
|
||||||
def gen_uscore_report():
|
def gen_uscore_report():
|
||||||
|
try:
|
||||||
|
current_app.logger.info("Start U-Score Report Generation")
|
||||||
with scheduler.app.app_context():
|
with scheduler.app.app_context():
|
||||||
date = datetime.date.today().strftime('%Y-%m-%d')
|
date = datetime.date.today().strftime('%Y-%m-%d')
|
||||||
report = Reports.query.filter(Reports.date==date).filter(Reports.report_type=="uscore").first()
|
report = Reports.query.filter(Reports.date==date).filter(Reports.report_type=="uscore").first()
|
||||||
|
|
||||||
# Only one report per day
|
# Only one report per day
|
||||||
if report != None:
|
if report != None:
|
||||||
return f"U-Score Report Already Generated for {date}"
|
current_app.logger.info(f"U-Score Report Already Generated for {date}")
|
||||||
|
|
||||||
characters = CharacterXML.query.join(
|
characters = CharacterXML.query.join(
|
||||||
CharacterInfo,
|
CharacterInfo,
|
||||||
@ -151,5 +161,7 @@ def gen_uscore_report():
|
|||||||
)
|
)
|
||||||
|
|
||||||
new_report.save()
|
new_report.save()
|
||||||
|
current_app.logger.info(f"Generated U-Score Report for {date}")
|
||||||
return f"Generated U-Score Report for {date}"
|
except Exception as e:
|
||||||
|
current_app.logger.critical(f"REPORT::U-SCORE - {e}")
|
||||||
|
return
|
||||||
|
Loading…
Reference in New Issue
Block a user