From 4d7452f3077fa67f68e0f591ec756f646ce2eafd Mon Sep 17 00:00:00 2001 From: Edgar Costa Date: Fri, 20 Feb 2026 20:58:30 -0500 Subject: [PATCH] Clean up loggers: remove make_logger, use logging.getLogger("lmfdb") Each LMFDB module had its own logging.Logger instance created via make_logger(), resulting in 55+ redundant loggers with complex, partially broken configuration logic. - Remove make_logger() from lmfdb/logger/utils.py entirely - Remove dead logfocus code from start.py (relied on per-module named loggers that are no longer created) - Remove all make_logger imports and calls across 75 files - For the ~20 files that actually use their logger, replace with standard logging.getLogger("lmfdb") - Remove 38 logger variables that were created but never used All logging now goes through a single "lmfdb" logger which propagates to the root logger configured in start.py. Fixes #6885 --- lmfdb/abvar/__init__.py | 2 - lmfdb/abvar/fq/__init__.py | 2 - lmfdb/abvar/fq/isog_class.py | 3 -- lmfdb/abvar/fq/main.py | 2 - lmfdb/abvar/fq/stats.py | 2 - lmfdb/api/__init__.py | 2 - lmfdb/api/api.py | 4 +- lmfdb/api2/__init__.py | 2 - lmfdb/artin_representations/__init__.py | 2 - lmfdb/belyi/__init__.py | 2 - lmfdb/bianchi_modular_forms/__init__.py | 2 - lmfdb/bianchi_modular_forms/web_BMF.py | 4 +- lmfdb/characters/TinyConrey.py | 4 +- lmfdb/characters/__init__.py | 2 - lmfdb/characters/web_character.py | 4 +- lmfdb/classical_modular_forms/__init__.py | 2 - lmfdb/cluster_pictures/__init__.py | 1 - lmfdb/cluster_pictures/web_cluster_picture.py | 2 - lmfdb/crystals/__init__.py | 2 - lmfdb/crystals/main.py | 4 +- lmfdb/ecnf/__init__.py | 2 - lmfdb/ecnf/ecnf_stats.py | 2 - lmfdb/ecnf/isog_class.py | 2 - lmfdb/elliptic_curves/__init__.py | 4 +- lmfdb/elliptic_curves/elliptic_curve.py | 4 +- lmfdb/elliptic_curves/isog_class.py | 3 +- lmfdb/elliptic_curves/web_ec.py | 5 +-- lmfdb/galois_groups/__init__.py | 2 - lmfdb/galois_groups/main.py | 5 ++- lmfdb/genus2_curves/__init__.py | 2 - lmfdb/genus2_curves/web_g2c.py | 3 +- lmfdb/groups/__init__.py | 2 - lmfdb/groups/abstract/__init__.py | 2 - lmfdb/groups/glnC/__init__.py | 2 - lmfdb/groups/glnQ/__init__.py | 2 - lmfdb/half_integral_weight_forms/__init__.py | 2 - lmfdb/hecke_algebras/__init__.py | 2 - lmfdb/hecke_algebras/hecke_algebras_stats.py | 2 - .../higher_genus_w_automorphisms/__init__.py | 2 - lmfdb/higher_genus_w_automorphisms/main.py | 4 +- lmfdb/hilbert_modular_forms/__init__.py | 2 - lmfdb/hilbert_modular_forms/hmf_stats.py | 2 - lmfdb/hilbert_modular_forms/web_HMF.py | 4 +- lmfdb/hypergm/__init__.py | 2 - lmfdb/knowledge/__init__.py | 2 - lmfdb/knowledge/main.py | 3 +- lmfdb/lattice/__init__.py | 2 - lmfdb/lattice/lattice_stats.py | 2 - lmfdb/lfunctions/Lfunction.py | 3 +- lmfdb/lfunctions/LfunctionPlot.py | 3 +- lmfdb/lfunctions/Lfunctionutilities.py | 3 +- lmfdb/lfunctions/__init__.py | 2 - lmfdb/local_fields/__init__.py | 2 - lmfdb/local_fields/main.py | 4 +- lmfdb/logger/__init__.py | 3 +- lmfdb/logger/start.py | 6 +-- lmfdb/logger/utils.py | 38 ------------------- lmfdb/maass_forms/__init__.py | 2 - lmfdb/modl_galois_representations/__init__.py | 2 - lmfdb/modlmf/__init__.py | 2 - lmfdb/modlmf/modlmf_stats.py | 4 +- lmfdb/modular_curves/__init__.py | 2 - lmfdb/modular_curves/isog_class.py | 3 +- lmfdb/motives/__init__.py | 2 - lmfdb/number_fields/__init__.py | 2 - lmfdb/number_fields/number_field.py | 9 ++--- lmfdb/number_fields/web_number_field.py | 2 - lmfdb/permutations/__init__.py | 2 - lmfdb/permutations/main.py | 4 +- lmfdb/siegel_modular_forms/__init__.py | 2 - lmfdb/tensor_products/__init__.py | 2 - lmfdb/typed_data/__init__.py | 2 - lmfdb/users/__init__.py | 2 - lmfdb/users/main.py | 4 +- lmfdb/zeros/zeta/zetazeros.py | 2 - 75 files changed, 54 insertions(+), 183 deletions(-) diff --git a/lmfdb/abvar/__init__.py b/lmfdb/abvar/__init__.py index 6937299e59..2bfa5e8e78 100644 --- a/lmfdb/abvar/__init__.py +++ b/lmfdb/abvar/__init__.py @@ -1,11 +1,9 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint abvar_page = Blueprint( "abvar", __name__, template_folder="templates", static_folder="static" ) -abvar_logger = make_logger(abvar_page) @abvar_page.context_processor diff --git a/lmfdb/abvar/fq/__init__.py b/lmfdb/abvar/fq/__init__.py index bdd949db70..6762edc1eb 100644 --- a/lmfdb/abvar/fq/__init__.py +++ b/lmfdb/abvar/fq/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint abvarfq_page = Blueprint("abvarfq", __name__, template_folder="templates", static_folder="static") -abvarfq_logger = make_logger(abvarfq_page) @abvarfq_page.context_processor diff --git a/lmfdb/abvar/fq/isog_class.py b/lmfdb/abvar/fq/isog_class.py index 188ecb1438..49778d333e 100644 --- a/lmfdb/abvar/fq/isog_class.py +++ b/lmfdb/abvar/fq/isog_class.py @@ -12,7 +12,6 @@ from collections import Counter from lmfdb.utils import encode_plot, display_float -from lmfdb.logger import make_logger from lmfdb import db from lmfdb.app import app @@ -44,8 +43,6 @@ def maxq(g, p): return maxgen[g] -logger = make_logger("abvarfq") - ######################### # Label manipulation diff --git a/lmfdb/abvar/fq/main.py b/lmfdb/abvar/fq/main.py index 981d910d85..e6144aab6f 100644 --- a/lmfdb/abvar/fq/main.py +++ b/lmfdb/abvar/fq/main.py @@ -6,7 +6,6 @@ from sage.databases.cremona import cremona_letter_code from lmfdb import db -from lmfdb.logger import make_logger from lmfdb.utils import ( to_dict, flash_error, integer_options, display_knowl, coeff_to_poly, SearchArray, TextBox, TextBoxWithSelect, SkipBox, CheckBox, CheckboxSpacer, YesNoBox, @@ -25,7 +24,6 @@ from lmfdb.abvar.fq.download import AbvarFq_download from lmfdb.utils.search_parsing import parse_primes -logger = make_logger("abvarfq") ######################### # Top level diff --git a/lmfdb/abvar/fq/stats.py b/lmfdb/abvar/fq/stats.py index 3a9100c66b..62287e89d6 100644 --- a/lmfdb/abvar/fq/stats.py +++ b/lmfdb/abvar/fq/stats.py @@ -4,11 +4,9 @@ from lmfdb import db from lmfdb.utils import comma, display_knowl, StatsDisplay, proportioners, totaler from psycodict.utils import range_formatter -from lmfdb.logger import make_logger from sage.misc.lazy_attribute import lazy_attribute from sage.misc.cachefunc import cached_method -logger = make_logger("abvarfq") def yn(t): return "yes" if (t and t != "no") else "no" def ynu(t): diff --git a/lmfdb/api/__init__.py b/lmfdb/api/__init__.py index e98fff0544..f341c104cc 100644 --- a/lmfdb/api/__init__.py +++ b/lmfdb/api/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint api_page = Blueprint("API", __name__, template_folder='templates', static_folder="static") -api_logger = make_logger(api_page) @api_page.context_processor def body_class(): diff --git a/lmfdb/api/api.py b/lmfdb/api/api.py index 789ba77d7d..f63e8d5e0c 100644 --- a/lmfdb/api/api.py +++ b/lmfdb/api/api.py @@ -8,9 +8,11 @@ from psycodict.encoding import Json from lmfdb.utils import flash_error, comma from lmfdb.utils.datetime_utils import utc_now_naive +import logging +api_logger = logging.getLogger("lmfdb") from flask import (render_template, request, url_for, current_app, abort, redirect, Response) -from lmfdb.api import api_page, api_logger +from lmfdb.api import api_page buffer = memoryview diff --git a/lmfdb/api2/__init__.py b/lmfdb/api2/__init__.py index dd03c3bc54..03ed0af801 100644 --- a/lmfdb/api2/__init__.py +++ b/lmfdb/api2/__init__.py @@ -1,8 +1,6 @@ from lmfdb.app import app assert app # keeps pyflakes happy -from lmfdb.logger import make_logger -assert make_logger # keeps pyflakes happy from flask import Blueprint __version__ = "1.0.0" diff --git a/lmfdb/artin_representations/__init__.py b/lmfdb/artin_representations/__init__.py index 915711b363..3d2c8e606f 100644 --- a/lmfdb/artin_representations/__init__.py +++ b/lmfdb/artin_representations/__init__.py @@ -1,11 +1,9 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint artin_representations_page = Blueprint( "artin_representations", __name__, template_folder='templates', static_folder="static") -artin_logger = make_logger("artin", hl=True) # artin_logger.info("Initializing Artin representations blueprint") diff --git a/lmfdb/belyi/__init__.py b/lmfdb/belyi/__init__.py index 61cdcc4d48..2b66d6b5d4 100644 --- a/lmfdb/belyi/__init__.py +++ b/lmfdb/belyi/__init__.py @@ -1,12 +1,10 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint belyi_page = Blueprint( "belyi", __name__, template_folder="templates", static_folder="static" ) -belyi_logger = make_logger(belyi_page) @belyi_page.context_processor diff --git a/lmfdb/bianchi_modular_forms/__init__.py b/lmfdb/bianchi_modular_forms/__init__.py index c54b738942..fade7fc569 100644 --- a/lmfdb/bianchi_modular_forms/__init__.py +++ b/lmfdb/bianchi_modular_forms/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint bmf_page = Blueprint("bmf", __name__, template_folder='templates', static_folder="static") -bmf_logger = make_logger(bmf_page) @bmf_page.context_processor diff --git a/lmfdb/bianchi_modular_forms/web_BMF.py b/lmfdb/bianchi_modular_forms/web_BMF.py index cfeb539903..43c57306f9 100644 --- a/lmfdb/bianchi_modular_forms/web_BMF.py +++ b/lmfdb/bianchi_modular_forms/web_BMF.py @@ -1,15 +1,15 @@ from lmfdb import db -from lmfdb.logger import make_logger from lmfdb.number_fields.web_number_field import nf_display_knowl, field_pretty from lmfdb.elliptic_curves.web_ec import split_lmfdb_label from lmfdb.nfutils.psort import primes_iter, ideal_from_label, ideal_label, prime_key from lmfdb.utils import web_latex, names_and_urls, prop_int_pretty +import logging +logger = logging.getLogger("lmfdb") from lmfdb.lfunctions.LfunctionDatabase import (get_lfunction_by_url, get_instances_by_Lhash_and_trace_hash) from flask import url_for from sage.all import QQ, PolynomialRing, NumberField -logger = make_logger("bmf") # BMFs which have no elliptic curve: since 2025-03-31 there is a # column 'curve_status' in table bmf_forms containing diff --git a/lmfdb/characters/TinyConrey.py b/lmfdb/characters/TinyConrey.py index 6b65ca8a4f..b3e00dbf5d 100644 --- a/lmfdb/characters/TinyConrey.py +++ b/lmfdb/characters/TinyConrey.py @@ -2,8 +2,8 @@ pari,DirichletGroup, CyclotomicField, euler_phi, lcm) from sage.misc.cachefunc import cached_method from sage.modular.dirichlet import DirichletCharacter -from lmfdb.logger import make_logger -logger = make_logger("TinyConrey") +import logging +logger = logging.getLogger("lmfdb") def symbol_numerator(cond, parity): # Reference: Sect. 9.3, Montgomery, Hugh L; Vaughan, Robert C. (2007). diff --git a/lmfdb/characters/__init__.py b/lmfdb/characters/__init__.py index c124121edf..358a36f084 100644 --- a/lmfdb/characters/__init__.py +++ b/lmfdb/characters/__init__.py @@ -1,11 +1,9 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint characters_page = Blueprint("characters", __name__, template_folder='templates', static_folder="static") -logger = make_logger(characters_page) @characters_page.context_processor diff --git a/lmfdb/characters/web_character.py b/lmfdb/characters/web_character.py index 6c9d3ab3a7..f968c78d0a 100644 --- a/lmfdb/characters/web_character.py +++ b/lmfdb/characters/web_character.py @@ -45,19 +45,19 @@ from flask import url_for from collections import defaultdict from sage.databases.cremona import cremona_letter_code +import logging +logger = logging.getLogger("lmfdb") from sage.all import (gcd, ZZ, Rational, Integers, cached_method, euler_phi, latex) from sage.misc.lazy_attribute import lazy_attribute from lmfdb import db from lmfdb.utils import prop_int_pretty from lmfdb.utils.utilities import num2letters -from lmfdb.logger import make_logger from lmfdb.number_fields.web_number_field import WebNumberField, formatfield, nf_display_knowl from lmfdb.characters.TinyConrey import (ConreyCharacter, kronecker_symbol, symbol_numerator, PariConreyGroup, get_sage_genvalues) from lmfdb.characters.utils import url_character, complex2str from lmfdb.groups.abstract.main import abstract_group_display_knowl -logger = make_logger("DC") def parity_string(n): diff --git a/lmfdb/classical_modular_forms/__init__.py b/lmfdb/classical_modular_forms/__init__.py index 244624ec87..3f0686cd5a 100644 --- a/lmfdb/classical_modular_forms/__init__.py +++ b/lmfdb/classical_modular_forms/__init__.py @@ -1,11 +1,9 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint cmf_page = Blueprint("cmf", __name__, template_folder='templates', static_folder="static") cmf = cmf_page -cmf_logger = make_logger(cmf_page) from . import main assert main # silence pyflakes diff --git a/lmfdb/cluster_pictures/__init__.py b/lmfdb/cluster_pictures/__init__.py index 78c1349c63..8911f00e7f 100644 --- a/lmfdb/cluster_pictures/__init__.py +++ b/lmfdb/cluster_pictures/__init__.py @@ -1,6 +1,5 @@ -# cp_logger = make_logger(cp_page) from . import cluster_picture assert cluster_picture diff --git a/lmfdb/cluster_pictures/web_cluster_picture.py b/lmfdb/cluster_pictures/web_cluster_picture.py index ad4ffc96c4..b3efcd2864 100644 --- a/lmfdb/cluster_pictures/web_cluster_picture.py +++ b/lmfdb/cluster_pictures/web_cluster_picture.py @@ -1,6 +1,4 @@ from lmfdb import db -from lmfdb.logger import make_logger -wcplog = make_logger("WCP") def cp_display_knowl(label, name=None, img=None): diff --git a/lmfdb/crystals/__init__.py b/lmfdb/crystals/__init__.py index 1a1a978404..e8bf903bc8 100644 --- a/lmfdb/crystals/__init__.py +++ b/lmfdb/crystals/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint crystals_page = Blueprint("crystals", __name__, template_folder='templates', static_folder="static") -logger = make_logger(crystals_page) @crystals_page.context_processor diff --git a/lmfdb/crystals/main.py b/lmfdb/crystals/main.py index b39bed7d1c..ab050bf2b4 100644 --- a/lmfdb/crystals/main.py +++ b/lmfdb/crystals/main.py @@ -2,7 +2,9 @@ # Author: Anne Schilling (lead), Mike Hansen, Harald Schilly from flask import render_template, request, url_for, make_response, redirect -from lmfdb.crystals import crystals_page, logger +from lmfdb.crystals import crystals_page +import logging +logger = logging.getLogger("lmfdb") def get_bread(breads=[]): diff --git a/lmfdb/ecnf/__init__.py b/lmfdb/ecnf/__init__.py index 7c9f9919b6..da86c794b7 100644 --- a/lmfdb/ecnf/__init__.py +++ b/lmfdb/ecnf/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint ecnf_page = Blueprint("ecnf", __name__, template_folder='templates', static_folder="static") -logger = make_logger(ecnf_page) @ecnf_page.context_processor diff --git a/lmfdb/ecnf/ecnf_stats.py b/lmfdb/ecnf/ecnf_stats.py index 6f8350e013..86174080fc 100644 --- a/lmfdb/ecnf/ecnf_stats.py +++ b/lmfdb/ecnf/ecnf_stats.py @@ -1,6 +1,5 @@ from lmfdb.app import app from lmfdb.utils import comma, StatsDisplay, proportioners, totaler -from lmfdb.logger import make_logger from lmfdb.number_fields.number_field import field_pretty from lmfdb import db from flask import url_for @@ -25,7 +24,6 @@ def sort_field(F): """ return [int(c) for c in F.split(".")] -logger = make_logger("ecnf") def latex_tor(t): if isinstance(t, str): diff --git a/lmfdb/ecnf/isog_class.py b/lmfdb/ecnf/isog_class.py index 291b75f1c5..4a9086f104 100644 --- a/lmfdb/ecnf/isog_class.py +++ b/lmfdb/ecnf/isog_class.py @@ -1,14 +1,12 @@ from flask import url_for from lmfdb import db from lmfdb.utils import encode_plot, names_and_urls, web_latex -from lmfdb.logger import make_logger from lmfdb.ecnf.WebEllipticCurve import web_ainvs, FIELD from lmfdb.number_fields.web_number_field import field_pretty, nf_display_knowl from sage.all import latex, Matrix, ZZ, Infinity from lmfdb.lfunctions.LfunctionDatabase import (get_lfunction_by_url, get_instances_by_Lhash_and_trace_hash) -logger = make_logger("ecnf") def curve_url(c): return url_for(".show_ecnf", diff --git a/lmfdb/elliptic_curves/__init__.py b/lmfdb/elliptic_curves/__init__.py index e38094bef1..06a8ae4aa6 100644 --- a/lmfdb/elliptic_curves/__init__.py +++ b/lmfdb/elliptic_curves/__init__.py @@ -1,11 +1,9 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint ec_page = Blueprint("ec", __name__, template_folder='templates', static_folder="static") -ec_logger = make_logger(ec_page) -#ec_logger.info("Initializing elliptic curves blueprint") + @ec_page.context_processor diff --git a/lmfdb/elliptic_curves/elliptic_curve.py b/lmfdb/elliptic_curves/elliptic_curve.py index 0fe40ea359..5e80fe1ba6 100644 --- a/lmfdb/elliptic_curves/elliptic_curve.py +++ b/lmfdb/elliptic_curves/elliptic_curve.py @@ -14,6 +14,8 @@ from lmfdb import db from lmfdb.app import app from psycodict.encoding import Json +import logging +ec_logger = logging.getLogger("lmfdb") from lmfdb.utils import (coeff_to_poly, coeff_to_poly_multi, web_latex, to_dict, comma, flash_error, display_knowl, raw_typeset, integer_divisors, integer_squarefree_part, parse_rational_to_list, parse_ints, parse_floats, parse_bracketed_posints, parse_primes, @@ -24,7 +26,7 @@ from lmfdb.utils.common_regex import ZLLIST_RE from lmfdb.utils.web_display import dispZmat_from_list from lmfdb.api import datapage -from lmfdb.elliptic_curves import ec_page, ec_logger +from lmfdb.elliptic_curves import ec_page from lmfdb.elliptic_curves.isog_class import ECisog_class from lmfdb.elliptic_curves.web_ec import WebEC, match_lmfdb_label, match_cremona_label, split_lmfdb_label, split_cremona_label, weierstrass_eqn_regex, short_weierstrass_eqn_regex, class_lmfdb_label, curve_lmfdb_label, EC_ainvs, latex_sha, gl2_subgroup_data, CREMONA_BOUND, match_weierstrass_polys, match_coeff_vec from sage.misc.cachefunc import cached_method diff --git a/lmfdb/elliptic_curves/isog_class.py b/lmfdb/elliptic_curves/isog_class.py index a7d08dd61b..14720f0598 100644 --- a/lmfdb/elliptic_curves/isog_class.py +++ b/lmfdb/elliptic_curves/isog_class.py @@ -1,6 +1,5 @@ from flask import url_for from lmfdb.utils import encode_plot, prop_int_pretty, raw_typeset, integer_squarefree_part, list_to_factored_poly_otherorder -from lmfdb.elliptic_curves import ec_logger from lmfdb.elliptic_curves.web_ec import split_lmfdb_label, split_cremona_label, OPTIMALITY_BOUND, CREMONA_BOUND from lmfdb.number_fields.web_number_field import field_pretty from lmfdb.lfunctions.Lfunctionutilities import Lfactor_to_label, AbvarExists @@ -8,6 +7,8 @@ from lmfdb import db from sage.all import latex, PowerSeriesRing, QQ, ZZ, RealField, nth_prime +import logging +ec_logger = logging.getLogger("lmfdb") class ECisog_class(): diff --git a/lmfdb/elliptic_curves/web_ec.py b/lmfdb/elliptic_curves/web_ec.py index 576c7152c0..2e24ca1969 100644 --- a/lmfdb/elliptic_curves/web_ec.py +++ b/lmfdb/elliptic_curves/web_ec.py @@ -9,10 +9,9 @@ from lmfdb.utils import web_latex, encode_plot, prop_int_pretty, raw_typeset, display_knowl, integer_squarefree_part, integer_prime_divisors, web_latex_factored_integer from lmfdb.utils.web_display import dispZmat_from_list from lmfdb.utils.common_regex import G1_LOOKUP_RE, ZLIST_RE -from lmfdb.logger import make_logger from sage.all import EllipticCurve, KodairaSymbol, latex, lazy_attribute, ZZ, QQ, prod, Factorization, PowerSeriesRing, prime_range, RealField, euler_phi, GL, Integers - +import logging RR = RealField(100) # reals in the database were computed to 100 bits (30 digits) but stored with 128 bits which must be truncated @@ -68,7 +67,7 @@ def class_cremona_label(conductor, iso_class): def cremona_label_to_lmfdb_label(clab): return clab if "." in clab else next(db.ec_curvedata.search({"Clabel": clab}, projection='lmfdb_label')) -logger = make_logger("ec") +logger = logging.getLogger("lmfdb") # S_LABEL_RE assumes surjective determinant, but we need extended Slabels for EC/NF # This can be removed if/when we add modular curves with non-surjective determinant to the modular curves database diff --git a/lmfdb/galois_groups/__init__.py b/lmfdb/galois_groups/__init__.py index 025bc7e438..aacf5a26ce 100644 --- a/lmfdb/galois_groups/__init__.py +++ b/lmfdb/galois_groups/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint galois_groups_page = Blueprint("galois_groups", __name__, template_folder='templates', static_folder="static") -logger = make_logger(galois_groups_page) @galois_groups_page.context_processor def body_class(): diff --git a/lmfdb/galois_groups/main.py b/lmfdb/galois_groups/main.py index ebb98319a0..12c03701d4 100644 --- a/lmfdb/galois_groups/main.py +++ b/lmfdb/galois_groups/main.py @@ -8,6 +8,8 @@ from lmfdb import db from lmfdb.app import app +import logging +logger = logging.getLogger("lmfdb") from lmfdb.utils import ( list_to_latex_matrix, flash_error, comma, to_dict, display_knowl, clean_input, prep_ranges, parse_bool, parse_ints, parse_galgrp, @@ -18,7 +20,7 @@ from lmfdb.utils.search_columns import SearchColumns, LinkCol, MultiProcessedCol, MathCol, CheckCol, SearchCol from lmfdb.api import datapage from lmfdb.number_fields.web_number_field import modules2string -from lmfdb.galois_groups import galois_groups_page, logger +from lmfdb.galois_groups import galois_groups_page from lmfdb.groups.abstract.main import abstract_group_display_knowl from .transitive_group import ( galois_module_knowl_guts, group_display_short, @@ -27,7 +29,6 @@ group_alias_table, WebGaloisGroup, knowl_cache) # Test to see if this gap installation knows about transitive groups -# logger = make_logger("GG") try: G = libgap.TransitiveGroup(9, 2) diff --git a/lmfdb/genus2_curves/__init__.py b/lmfdb/genus2_curves/__init__.py index 3799470eac..6fb0e913f9 100644 --- a/lmfdb/genus2_curves/__init__.py +++ b/lmfdb/genus2_curves/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint g2c_page = Blueprint("g2c", __name__, template_folder='templates') -g2c_logger = make_logger(g2c_page) @g2c_page.context_processor def body_class(): diff --git a/lmfdb/genus2_curves/web_g2c.py b/lmfdb/genus2_curves/web_g2c.py index 519ac0516b..5f12146599 100644 --- a/lmfdb/genus2_curves/web_g2c.py +++ b/lmfdb/genus2_curves/web_g2c.py @@ -4,6 +4,8 @@ import re import yaml from lmfdb import db +import logging +g2c_logger = logging.getLogger("lmfdb") from lmfdb.utils import (key_for_numerically_sort, encode_plot, prop_int_pretty, list_to_factored_poly_otherorder, make_bigint, names_and_urls, display_knowl, web_latex_factored_integer, integer_squarefree_part, integer_prime_divisors) @@ -16,7 +18,6 @@ from lmfdb.groups.abstract.main import abstract_group_display_knowl from lmfdb.galois_groups.transitive_group import transitive_group_display_knowl from lmfdb.sato_tate_groups.main import st_display_knowl, st_anchor, convert_label -from lmfdb.genus2_curves import g2c_logger from lmfdb.lfunctions.Lfunctionutilities import Lfactor_to_label, AbvarExists from lmfdb.abvar.fq.main import url_for_label diff --git a/lmfdb/groups/__init__.py b/lmfdb/groups/__init__.py index c4c9024183..070b622f30 100644 --- a/lmfdb/groups/__init__.py +++ b/lmfdb/groups/__init__.py @@ -1,9 +1,7 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint groups_page = Blueprint("groups", __name__, template_folder='templates', static_folder="static") groups = groups_page -groups_logger = make_logger(groups_page) app.register_blueprint(groups_page, url_prefix="/Groups") diff --git a/lmfdb/groups/abstract/__init__.py b/lmfdb/groups/abstract/__init__.py index 8894dbf51d..4381e33679 100644 --- a/lmfdb/groups/abstract/__init__.py +++ b/lmfdb/groups/abstract/__init__.py @@ -1,11 +1,9 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint abstract_page = Blueprint("abstract", __name__, template_folder='templates', static_folder="static") -abstract_logger = make_logger(abstract_page) @abstract_page.context_processor def body_class(): diff --git a/lmfdb/groups/glnC/__init__.py b/lmfdb/groups/glnC/__init__.py index 585013ad8f..5ac5d12a5d 100644 --- a/lmfdb/groups/glnC/__init__.py +++ b/lmfdb/groups/glnC/__init__.py @@ -1,9 +1,7 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint glnC_page = Blueprint("glnC", __name__, template_folder='templates', static_folder="static") -glnC_logger = make_logger(glnC_page) from . import main assert main # silence pyflakes diff --git a/lmfdb/groups/glnQ/__init__.py b/lmfdb/groups/glnQ/__init__.py index eaaa85409d..e12392a5ce 100644 --- a/lmfdb/groups/glnQ/__init__.py +++ b/lmfdb/groups/glnQ/__init__.py @@ -1,9 +1,7 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint glnQ_page = Blueprint("glnQ", __name__, template_folder='templates', static_folder="static") -glnQ_logger = make_logger(glnQ_page) from . import main assert main # silence pyflakes diff --git a/lmfdb/half_integral_weight_forms/__init__.py b/lmfdb/half_integral_weight_forms/__init__.py index e301592880..98b245bf55 100644 --- a/lmfdb/half_integral_weight_forms/__init__.py +++ b/lmfdb/half_integral_weight_forms/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint hiwf_page = Blueprint("hiwf", __name__, template_folder='templates', static_folder="static") -hiwf_logger = make_logger(hiwf_page) @hiwf_page.context_processor diff --git a/lmfdb/hecke_algebras/__init__.py b/lmfdb/hecke_algebras/__init__.py index 28fca3dfdf..318ba67eac 100644 --- a/lmfdb/hecke_algebras/__init__.py +++ b/lmfdb/hecke_algebras/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint hecke_algebras_page = Blueprint("hecke_algebras", __name__, template_folder='templates', static_folder="static") -hecke_algebras_logger = make_logger(hecke_algebras_page) @hecke_algebras_page.context_processor diff --git a/lmfdb/hecke_algebras/hecke_algebras_stats.py b/lmfdb/hecke_algebras/hecke_algebras_stats.py index 6b3d0fc083..6fbf862cca 100644 --- a/lmfdb/hecke_algebras/hecke_algebras_stats.py +++ b/lmfdb/hecke_algebras/hecke_algebras_stats.py @@ -1,9 +1,7 @@ from lmfdb.app import app from lmfdb.utils import comma -from lmfdb.logger import make_logger from lmfdb import db -logger = make_logger("hecke_algebras") def hecke_algebras_summary(): diff --git a/lmfdb/higher_genus_w_automorphisms/__init__.py b/lmfdb/higher_genus_w_automorphisms/__init__.py index 6e7885031c..318313001f 100644 --- a/lmfdb/higher_genus_w_automorphisms/__init__.py +++ b/lmfdb/higher_genus_w_automorphisms/__init__.py @@ -1,12 +1,10 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint higher_genus_w_automorphisms_page = Blueprint("higher_genus_w_automorphisms", __name__, template_folder='templates', static_folder="static") -logger = make_logger(higher_genus_w_automorphisms_page) @higher_genus_w_automorphisms_page.context_processor diff --git a/lmfdb/higher_genus_w_automorphisms/main.py b/lmfdb/higher_genus_w_automorphisms/main.py index 1b788584fa..676afdd8e6 100644 --- a/lmfdb/higher_genus_w_automorphisms/main.py +++ b/lmfdb/higher_genus_w_automorphisms/main.py @@ -8,11 +8,12 @@ from io import BytesIO import yaml -from lmfdb.logger import make_logger from flask import render_template, request, url_for, redirect, send_file, abort from sage.all import Permutation from lmfdb import db +import logging +logger = logging.getLogger("lmfdb") from lmfdb.utils import ( flash_error, to_dict, Downloader, SearchArray, TextBox, ExcludeOnlyBox, CountBox, @@ -27,7 +28,6 @@ from lmfdb.higher_genus_w_automorphisms.hgcwa_stats import HGCWAstats from collections import defaultdict -logger = make_logger("hgcwa") #Parsing group order LIST_RE = re.compile(r'^(\d+|(\d*-(\d+)?)|((\d*)\**(g((\+|\-)(\d*))*|\(g(\+|\-)(\d+)\))))(,(\d+|(\d*-(\d+)?)|((\d*)\**(g((\+|\-)(\d*))*|\(g(\+|\-)(\d+)\)))))*$') diff --git a/lmfdb/hilbert_modular_forms/__init__.py b/lmfdb/hilbert_modular_forms/__init__.py index 51f51fb91a..b06dcb7ada 100644 --- a/lmfdb/hilbert_modular_forms/__init__.py +++ b/lmfdb/hilbert_modular_forms/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint hmf_page = Blueprint("hmf", __name__, template_folder='templates', static_folder="static") -hmf_logger = make_logger(hmf_page) @hmf_page.context_processor diff --git a/lmfdb/hilbert_modular_forms/hmf_stats.py b/lmfdb/hilbert_modular_forms/hmf_stats.py index ea7285dd02..a32d004ced 100644 --- a/lmfdb/hilbert_modular_forms/hmf_stats.py +++ b/lmfdb/hilbert_modular_forms/hmf_stats.py @@ -2,11 +2,9 @@ from lmfdb import db from lmfdb.utils import comma from lmfdb.utils.display_stats import StatsDisplay, proportioners, totaler -from lmfdb.logger import make_logger from lmfdb.number_fields.web_number_field import nf_display_knowl from sage.misc.cachefunc import cached_method -logger = make_logger("hmf") class HMFstats(StatsDisplay): """ diff --git a/lmfdb/hilbert_modular_forms/web_HMF.py b/lmfdb/hilbert_modular_forms/web_HMF.py index bda3e2791d..132d297de6 100644 --- a/lmfdb/hilbert_modular_forms/web_HMF.py +++ b/lmfdb/hilbert_modular_forms/web_HMF.py @@ -8,9 +8,9 @@ from lmfdb import db from lmfdb.hilbert_modular_forms.hilbert_field import HilbertNumberField -from lmfdb.logger import make_logger +import logging -logger = make_logger("hmf") +logger = logging.getLogger("lmfdb") def construct_full_label(field_label, weight, level_label, label_suffix): diff --git a/lmfdb/hypergm/__init__.py b/lmfdb/hypergm/__init__.py index 392bfaf8da..1761c76326 100644 --- a/lmfdb/hypergm/__init__.py +++ b/lmfdb/hypergm/__init__.py @@ -1,11 +1,9 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint hypergm_page = Blueprint("hypergm", __name__, template_folder='templates', static_folder="static") -hgm_logger = make_logger(hypergm_page) @hypergm_page.context_processor diff --git a/lmfdb/knowledge/__init__.py b/lmfdb/knowledge/__init__.py index 48187a7721..0925227f5d 100644 --- a/lmfdb/knowledge/__init__.py +++ b/lmfdb/knowledge/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint knowledge_page = Blueprint("knowledge", __name__, template_folder='templates') -logger = make_logger(knowledge_page) from . import main assert main diff --git a/lmfdb/knowledge/main.py b/lmfdb/knowledge/main.py index 3ddc154b16..fd153778d4 100644 --- a/lmfdb/knowledge/main.py +++ b/lmfdb/knowledge/main.py @@ -17,6 +17,8 @@ import time from collections import Counter, defaultdict from lmfdb.app import app, is_beta +import logging +logger = logging.getLogger("lmfdb") from flask import (abort, flash, jsonify, make_response, redirect, render_template, render_template_string, request, url_for) @@ -27,7 +29,6 @@ from lmfdb.users.pwdmanager import userdb from lmfdb.utils import to_dict, code_snippet_knowl import markdown -from lmfdb.knowledge import logger from lmfdb.utils.datetime_utils import datetime_to_timestamp_in_ms, timestamp_in_ms_to_datetime from lmfdb.utils import flash_error from lmfdb.knowledge import knowledge_page diff --git a/lmfdb/lattice/__init__.py b/lmfdb/lattice/__init__.py index 1fd009b2a5..ff9bc333f0 100644 --- a/lmfdb/lattice/__init__.py +++ b/lmfdb/lattice/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint lattice_page = Blueprint("lattice", __name__, template_folder='templates', static_folder="static") -lattice_logger = make_logger(lattice_page) @lattice_page.context_processor diff --git a/lmfdb/lattice/lattice_stats.py b/lmfdb/lattice/lattice_stats.py index 60b70167ed..89b6c49685 100644 --- a/lmfdb/lattice/lattice_stats.py +++ b/lmfdb/lattice/lattice_stats.py @@ -1,9 +1,7 @@ from flask import url_for from lmfdb import db from lmfdb.utils import comma, StatsDisplay, display_knowl, proportioners, totaler -from lmfdb.logger import make_logger -logger = make_logger("lattice") class Lattice_stats(StatsDisplay): def __init__(self): diff --git a/lmfdb/lfunctions/Lfunction.py b/lmfdb/lfunctions/Lfunction.py index 167e43bb6f..ebadcaca33 100644 --- a/lmfdb/lfunctions/Lfunction.py +++ b/lmfdb/lfunctions/Lfunction.py @@ -10,6 +10,8 @@ import re from flask import url_for +import logging +logger = logging.getLogger("lmfdb") from sage.all import ( CBF, CC, @@ -64,7 +66,6 @@ from lmfdb.artin_representations.math_classes import ArtinRepresentation import lmfdb.hypergm.hodge from .Lfunction_base import Lfunction -from lmfdb.lfunctions import logger from .Lfunctionutilities import ( string2number, compute_local_roots_SMF2_scalar_valued,) diff --git a/lmfdb/lfunctions/LfunctionPlot.py b/lmfdb/lfunctions/LfunctionPlot.py index e01e4eab86..ab3b5f30ca 100644 --- a/lmfdb/lfunctions/LfunctionPlot.py +++ b/lmfdb/lfunctions/LfunctionPlot.py @@ -3,12 +3,13 @@ import math from flask import url_for from lmfdb import db -from lmfdb.lfunctions import logger from sage.all import prod from sage.arith.srange import srange from lmfdb.utils import signtocolour from sage.databases.cremona import cremona_letter_code from lmfdb.characters.TinyConrey import ConreyCharacter +import logging +logger = logging.getLogger("lmfdb") def svgBegin(): diff --git a/lmfdb/lfunctions/Lfunctionutilities.py b/lmfdb/lfunctions/Lfunctionutilities.py index 1aa8372d8f..e1dd166dc9 100644 --- a/lmfdb/lfunctions/Lfunctionutilities.py +++ b/lmfdb/lfunctions/Lfunctionutilities.py @@ -3,6 +3,8 @@ import re from flask import url_for +import logging +logger = logging.getLogger("lmfdb") from sage.all import ( ZZ, QQ, RR, CC, Rational, RationalField, ComplexField, PolynomialRing, PowerSeriesRing, Integer, primes, CDF, I, real_part, imag_part, @@ -12,7 +14,6 @@ display_complex, list_to_factored_poly_otherorder, make_bigint, list_factored_to_factored_poly_otherorder, coeff_to_poly) from lmfdb.galois_groups.transitive_group import transitive_group_display_knowl_C1_as_trivial -from lmfdb.lfunctions import logger from sage.databases.cremona import cremona_letter_code from lmfdb.abvar.fq.main import url_for_label from lmfdb.abvar.fq.stats import AbvarFqStats diff --git a/lmfdb/lfunctions/__init__.py b/lmfdb/lfunctions/__init__.py index 505352c4f5..87d921738b 100644 --- a/lmfdb/lfunctions/__init__.py +++ b/lmfdb/lfunctions/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint l_function_page = Blueprint("l_functions", __name__, template_folder='templates', static_folder="static") -logger = make_logger("LF") @l_function_page.context_processor diff --git a/lmfdb/local_fields/__init__.py b/lmfdb/local_fields/__init__.py index 10f92ed653..7f054d02cd 100644 --- a/lmfdb/local_fields/__init__.py +++ b/lmfdb/local_fields/__init__.py @@ -1,9 +1,7 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint, request, redirect local_fields_page = Blueprint("local_fields", __name__, template_folder='templates', static_folder="static") -logger = make_logger(local_fields_page) @local_fields_page.context_processor diff --git a/lmfdb/local_fields/main.py b/lmfdb/local_fields/main.py index 81196389dc..5748c59555 100644 --- a/lmfdb/local_fields/main.py +++ b/lmfdb/local_fields/main.py @@ -3,8 +3,10 @@ import os import yaml +import logging from flask import abort, render_template, request, url_for, redirect, make_response +logger = logging.getLogger("lmfdb") from sage.all import ( PolynomialRing, ZZ, QQ, RR, latex, cached_function, Integers, euler_phi, is_prime) from sage.plot.all import line, points, text, Graphics, polygon @@ -25,7 +27,7 @@ from lmfdb.utils.search_columns import SearchColumns, LinkCol, MathCol, ProcessedCol, MultiProcessedCol, RationalListCol, PolynomialCol, eval_rational_list from lmfdb.utils.search_parsing import search_parser from lmfdb.api import datapage -from lmfdb.local_fields import local_fields_page, logger +from lmfdb.local_fields import local_fields_page from lmfdb.local_fields.family import pAdicSlopeFamily, FAMILY_RE, latex_content, content_unformatter from lmfdb.groups.abstract.main import abstract_group_display_knowl from lmfdb.galois_groups.transitive_group import ( diff --git a/lmfdb/logger/__init__.py b/lmfdb/logger/__init__.py index c21ab15c6f..ebad5d3906 100644 --- a/lmfdb/logger/__init__.py +++ b/lmfdb/logger/__init__.py @@ -2,8 +2,7 @@ from logging import info, warning, debug, critical from .start import start_logging, logger_file_handler -from .utils import make_logger start_logging() -__all__ = ['info', 'warning', 'debug', 'critical', 'make_logger', 'logger_file_handler'] +__all__ = ['info', 'warning', 'debug', 'critical', 'logger_file_handler'] diff --git a/lmfdb/logger/start.py b/lmfdb/logger/start.py index 46bd8f40ea..e713da25eb 100644 --- a/lmfdb/logger/start.py +++ b/lmfdb/logger/start.py @@ -1,5 +1,5 @@ from logging import (FileHandler, getLogger, StreamHandler, Formatter, - INFO, WARNING, DEBUG, + INFO, WARNING, info, warning) from sage.version import version as sage_version @@ -25,10 +25,6 @@ def start_logging(): file_handler = FileHandler(logging_options['logfile']) file_handler.setLevel(WARNING) - if 'logfocus' in logging_options: - logfocus = logging_options['logfocus'] - getLogger(logfocus).setLevel(DEBUG) - root_logger = getLogger() root_logger.setLevel(logging_options.get('loglevel', INFO)) root_logger.name = "LMFDB" diff --git a/lmfdb/logger/utils.py b/lmfdb/logger/utils.py index 8d02cd30af..47373ce451 100644 --- a/lmfdb/logger/utils.py +++ b/lmfdb/logger/utils.py @@ -48,41 +48,3 @@ def format(self, record): return logging.Formatter.format(self, record) -def make_logger(bp_or_name, hl=False, fmt=None, extraHandlers=[]): - """ - creates a logger for the given blueprint. if hl is set - to true, the corresponding lines will be bold. - """ - import flask - from lmfdb.utils.config import Configuration - config = Configuration() - logging_options = config.get_logging() - logfocus = logging_options.get('logfocus') - if isinstance(bp_or_name, flask.Blueprint): - name = bp_or_name.name - else: - assert isinstance(bp_or_name, str) - name = bp_or_name - l = logging.getLogger(name) - l.propagate = False - if logfocus is None: - l.setLevel(logging_options.get('loglevel', logging.INFO)) - elif logfocus == name: - # this will NEVER BE TRUE, because logfocus is set AFTER - # we have created all of the loggers. This is ok for now, - # because we are setting the log level later when we set - # the logfocus variable. - # - # Maybe someday someone will rewrite this so that it makes - # sense... - l.setLevel(logging.DEBUG) - else: - l.setLevel(logging.WARNING) - if len(l.handlers) == 0: - formatter = LmfdbFormatter(hl=name if hl else None, fmt=fmt) - ch = logging.StreamHandler() - ch.setFormatter(formatter) - l.addHandler(ch) - for elt in extraHandlers: - l.addHandler(elt) - return l diff --git a/lmfdb/maass_forms/__init__.py b/lmfdb/maass_forms/__init__.py index a7bcce15ae..c2adbb0fe1 100644 --- a/lmfdb/maass_forms/__init__.py +++ b/lmfdb/maass_forms/__init__.py @@ -1,11 +1,9 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint maass_forms_page = Blueprint("maass_forms", __name__, template_folder='templates') -logger = make_logger(maass_forms_page) @maass_forms_page.context_processor diff --git a/lmfdb/modl_galois_representations/__init__.py b/lmfdb/modl_galois_representations/__init__.py index 1b96e1cbfb..f7270ef49e 100644 --- a/lmfdb/modl_galois_representations/__init__.py +++ b/lmfdb/modl_galois_representations/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint modlgal_page = Blueprint("modlgal", __name__, template_folder='templates', static_folder="static") -modlgal_logger = make_logger(modlgal_page) from . import main assert main #silence pyflakes diff --git a/lmfdb/modlmf/__init__.py b/lmfdb/modlmf/__init__.py index 5e3d43c43f..1279c525cc 100644 --- a/lmfdb/modlmf/__init__.py +++ b/lmfdb/modlmf/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint modlmf_page = Blueprint("modlmf", __name__, template_folder='templates', static_folder="static") -modlmf_logger = make_logger(modlmf_page) @modlmf_page.context_processor diff --git a/lmfdb/modlmf/modlmf_stats.py b/lmfdb/modlmf/modlmf_stats.py index aee01100a7..b5b734fd00 100644 --- a/lmfdb/modlmf/modlmf_stats.py +++ b/lmfdb/modlmf/modlmf_stats.py @@ -1,10 +1,10 @@ from lmfdb.app import app from lmfdb import db from lmfdb.utils import comma -from lmfdb.logger import make_logger from sage.misc.cachefunc import cached_method +import logging -logger = make_logger("modlmfs") +logger = logging.getLogger("lmfdb") the_modlmf_stats = None diff --git a/lmfdb/modular_curves/__init__.py b/lmfdb/modular_curves/__init__.py index 902f647772..b1040c70ab 100644 --- a/lmfdb/modular_curves/__init__.py +++ b/lmfdb/modular_curves/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint modcurve_page = Blueprint("modcurve", __name__, template_folder='templates') -modcurve_logger = make_logger(modcurve_page) from . import main assert main # silence pyflakes diff --git a/lmfdb/modular_curves/isog_class.py b/lmfdb/modular_curves/isog_class.py index 64941c97db..c99a09c9e3 100644 --- a/lmfdb/modular_curves/isog_class.py +++ b/lmfdb/modular_curves/isog_class.py @@ -1,10 +1,11 @@ from flask import url_for from lmfdb.utils import prop_int_pretty -from lmfdb.modular_curves import modcurve_logger from lmfdb.modular_curves.web_curve import modcurve_link, ISO_CLASS_RE, WebModCurve from lmfdb import db from sage.databases.cremona import class_to_int, cremona_letter_code +import logging +modcurve_logger = logging.getLogger("lmfdb") class ModCurveIsog_class(): """ diff --git a/lmfdb/motives/__init__.py b/lmfdb/motives/__init__.py index fc6b125d2d..cce0c33b52 100644 --- a/lmfdb/motives/__init__.py +++ b/lmfdb/motives/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint motive_page = Blueprint("motive", __name__, template_folder='templates', static_folder="static") -motive_logger = make_logger(motive_page) @motive_page.context_processor diff --git a/lmfdb/number_fields/__init__.py b/lmfdb/number_fields/__init__.py index af6e2ac2f0..3fccc24d60 100644 --- a/lmfdb/number_fields/__init__.py +++ b/lmfdb/number_fields/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint nf_page = Blueprint("number_fields", __name__, template_folder='templates', static_folder="static") -nf_logger = make_logger(nf_page) @nf_page.context_processor def body_class(): diff --git a/lmfdb/number_fields/number_field.py b/lmfdb/number_fields/number_field.py index c9d153869b..f822c6adff 100644 --- a/lmfdb/number_fields/number_field.py +++ b/lmfdb/number_fields/number_field.py @@ -7,6 +7,8 @@ from sage.all import ZZ, QQ, PolynomialRing, NumberField, latex, prime_range, RealField, log from lmfdb import db from lmfdb.app import app +import logging +logger = logging.getLogger("lmfdb") from lmfdb.utils import ( web_latex, to_dict, coeff_to_poly, comma, format_percentage, flash_error, display_knowl, CountBox, Downloader, prop_int_pretty, @@ -28,12 +30,11 @@ group_character_table_knowl_guts, group_alias_table, dihedral_gal, dihedral_ngal, multiquad) from lmfdb.groups.abstract.main import abstract_group_display_knowl -from lmfdb.number_fields import nf_page, nf_logger +from lmfdb.number_fields import nf_page from lmfdb.number_fields.web_number_field import ( field_pretty, WebNumberField, nf_knowl_guts, factor_base_factor, factor_base_factorization_latex, fake_label, formatfield) -assert nf_logger def bread_prefix(): return [('Number fields', url_for(".number_field_render_webpage"))] @@ -209,10 +210,6 @@ def render_discriminants_page(): @nf_page.route("/QuadraticImaginaryClassGroups") def render_class_group_data(): info = to_dict(request.args) - #nf_logger.info('******************* ') - #for k in info.keys(): - # nf_logger.info(str(k) + ' ---> ' + str(info[k])) - #nf_logger.info('******************* ') learnmore = learnmore_list_remove('Quadratic imaginary') t = 'Class groups of quadratic imaginary fields' bread = [("Datasets", url_for("datasets")), (t, ' ')] diff --git a/lmfdb/number_fields/web_number_field.py b/lmfdb/number_fields/web_number_field.py index 775d9e58af..9ed1f46ddb 100644 --- a/lmfdb/number_fields/web_number_field.py +++ b/lmfdb/number_fields/web_number_field.py @@ -13,11 +13,9 @@ integer_squarefree_part, integer_is_squarefree, factor_base_factorization_latex) from lmfdb.utils.web_display import compress_int -from lmfdb.logger import make_logger from lmfdb.galois_groups.transitive_group import WebGaloisGroup, transitive_group_display_knowl, galois_module_knowl, group_pretty_and_nTj from lmfdb.number_fields.draw_spectrum import draw_spec, draw_gaga -wnflog = make_logger("WNF") dir_group_size_bound = 10000 dnc = 'data not computed' diff --git a/lmfdb/permutations/__init__.py b/lmfdb/permutations/__init__.py index 84f02bb7b3..2cc9db0838 100644 --- a/lmfdb/permutations/__init__.py +++ b/lmfdb/permutations/__init__.py @@ -1,10 +1,8 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint permutations_page = Blueprint("permutations", __name__, template_folder='templates', static_folder="static") -logger = make_logger(permutations_page) @permutations_page.context_processor diff --git a/lmfdb/permutations/main.py b/lmfdb/permutations/main.py index a9fed0e209..a33de3c7e6 100644 --- a/lmfdb/permutations/main.py +++ b/lmfdb/permutations/main.py @@ -2,9 +2,11 @@ # Author: Sebastien Labbe from flask import render_template, request, url_for, redirect -from lmfdb.permutations import permutations_page, logger +from lmfdb.permutations import permutations_page from sage.all import Permutation, Integer from lmfdb.utils import flash_error +import logging +logger = logging.getLogger("lmfdb") def get_bread(breads=[]): diff --git a/lmfdb/siegel_modular_forms/__init__.py b/lmfdb/siegel_modular_forms/__init__.py index 92614648d1..a6bca07e86 100644 --- a/lmfdb/siegel_modular_forms/__init__.py +++ b/lmfdb/siegel_modular_forms/__init__.py @@ -1,11 +1,9 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint smf_page = Blueprint('smf', __name__, template_folder='templates', static_folder='static') -smf_logger = make_logger(smf_page) @smf_page.context_processor diff --git a/lmfdb/tensor_products/__init__.py b/lmfdb/tensor_products/__init__.py index 436f7f93de..4fceb7b993 100644 --- a/lmfdb/tensor_products/__init__.py +++ b/lmfdb/tensor_products/__init__.py @@ -1,11 +1,9 @@ from lmfdb.app import app -from lmfdb.logger import make_logger from flask import Blueprint tensor_products_page = Blueprint( "tensor_products", __name__, template_folder='templates', static_folder="static") -tensor_products_logger = make_logger("tensor_products", hl=True) @tensor_products_page.context_processor def body_class(): diff --git a/lmfdb/typed_data/__init__.py b/lmfdb/typed_data/__init__.py index c0ac4d808a..5ade6622a6 100644 --- a/lmfdb/typed_data/__init__.py +++ b/lmfdb/typed_data/__init__.py @@ -1,6 +1,4 @@ -from lmfdb.logger import make_logger -typed_data_logger = make_logger("typed_data_logger", hl=True) from . import type_generation assert type_generation diff --git a/lmfdb/users/__init__.py b/lmfdb/users/__init__.py index a95b9939f8..f7bc1a684e 100644 --- a/lmfdb/users/__init__.py +++ b/lmfdb/users/__init__.py @@ -13,11 +13,9 @@ assert housekeeping # silence pyflakes from lmfdb.app import app -from lmfdb.logger import make_logger login_manager.init_app(app) app.register_blueprint(login_page, url_prefix="/users") -users_logger = make_logger("users", hl=True) diff --git a/lmfdb/users/main.py b/lmfdb/users/main.py index 847b800c04..cfb18f3846 100644 --- a/lmfdb/users/main.py +++ b/lmfdb/users/main.py @@ -5,7 +5,6 @@ import flask from functools import wraps from lmfdb.app import app -from lmfdb.logger import make_logger from flask import render_template, request, Blueprint, url_for, make_response from flask_login import login_required, login_user, current_user, logout_user, LoginManager from lmfdb.utils import flash_error, to_dict @@ -13,11 +12,12 @@ from markupsafe import Markup from lmfdb import db +import logging assert db login_page = Blueprint("users", __name__, template_folder='templates') -logger = make_logger(login_page) +logger = logging.getLogger("lmfdb") import re allowed_usernames = re.compile("^[a-zA-Z0-9._-]+$") diff --git a/lmfdb/zeros/zeta/zetazeros.py b/lmfdb/zeros/zeta/zetazeros.py index b4c5c76411..770b31eb38 100644 --- a/lmfdb/zeros/zeta/zetazeros.py +++ b/lmfdb/zeros/zeta/zetazeros.py @@ -1,11 +1,9 @@ from mpmath import nstr, inf from sage.all import floor, log -from lmfdb.logger import make_logger from flask import render_template, request, url_for, Blueprint, Response ZetaZeros = Blueprint("zeta zeros", __name__, template_folder="templates") -logger = make_logger(ZetaZeros) from .platt_zeros import zeros_starting_at_N, zeros_starting_at_t