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..09a59af0e1 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,9 +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..b114f83056 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,8 +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..f14b681b85 100644 --- a/lmfdb/api/api.py +++ b/lmfdb/api/api.py @@ -8,9 +8,10 @@ from psycodict.encoding import Json from lmfdb.utils import flash_error, comma from lmfdb.utils.datetime_utils import utc_now_naive +from lmfdb.logger import logger 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 @@ -221,7 +222,7 @@ def apierror(msg, flash_extras=[], code=404, table=True): if offset: return apierror("Cannot include offset with id") single_object = True - api_logger.info("API query: id = '%s', fields = '%s'" % (id, fields)) + logger.info("API query: id = '%s', fields = '%s'" % (id, fields)) if re.match(r'^\d+$', id): id = int(id) else: 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/app.py b/lmfdb/app.py index 8bfb0f4f20..0160b273db 100644 --- a/lmfdb/app.py +++ b/lmfdb/app.py @@ -20,7 +20,7 @@ from sage.all import cached_function # acknowledgment page, reads info from CONTRIBUTORS.yaml -from .logger import logger_file_handler, critical +from .logger import critical from .homepage import load_boxes, contribs LMFDB_VERSION = "LMFDB Release 1.2.1" @@ -80,8 +80,6 @@ def is_running(): ############################ -app.logger.addHandler(logger_file_handler()) - # If the debug toolbar is installed then use it if app.debug: try: diff --git a/lmfdb/artin_representations/__init__.py b/lmfdb/artin_representations/__init__.py index 915711b363..7e8d958205 100644 --- a/lmfdb/artin_representations/__init__.py +++ b/lmfdb/artin_representations/__init__.py @@ -1,14 +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") - @artin_representations_page.context_processor def body_class(): diff --git a/lmfdb/artin_representations/main.py b/lmfdb/artin_representations/main.py index f498ed60d4..1ae9ac47af 100644 --- a/lmfdb/artin_representations/main.py +++ b/lmfdb/artin_representations/main.py @@ -25,7 +25,6 @@ group_pretty_and_nTj) from lmfdb.artin_representations import artin_representations_page -#from lmfdb.artin_representations import artin_logger from lmfdb.artin_representations.math_classes import ( ArtinRepresentation, num2letters, artin_label_pretty) @@ -339,8 +338,6 @@ def render_artin_representation_webpage(label): label = newlabel bread = get_bread([(artin_label_pretty(label), ' ')]) - #artin_logger.info("Found %s" % (the_rep._data)) - if case == 'rep': title = "Artin representation %s" % label else: 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..93ec3d1880 100644 --- a/lmfdb/bianchi_modular_forms/web_BMF.py +++ b/lmfdb/bianchi_modular_forms/web_BMF.py @@ -1,5 +1,4 @@ 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 @@ -9,8 +8,6 @@ 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 # +1 if there is a matching curve in ec_nfcurves @@ -121,7 +118,6 @@ def __init__(self, dbdata, max_eigs=50): is initialised. """ - logger.debug("Constructing an instance of WebBMF class from database") self.__dict__.update(dbdata) # All other fields are handled here self.make_form(max_eigs) diff --git a/lmfdb/characters/TinyConrey.py b/lmfdb/characters/TinyConrey.py index 6b65ca8a4f..6c64320e8c 100644 --- a/lmfdb/characters/TinyConrey.py +++ b/lmfdb/characters/TinyConrey.py @@ -2,8 +2,7 @@ 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") +from lmfdb.logger import logger 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..c423d31b31 100644 --- a/lmfdb/characters/web_character.py +++ b/lmfdb/characters/web_character.py @@ -51,13 +51,12 @@ 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") +from lmfdb.logger import logger 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/classical_modular_forms/cmf_test_pages.py b/lmfdb/classical_modular_forms/cmf_test_pages.py index 06b63638b5..ed4a68128d 100644 --- a/lmfdb/classical_modular_forms/cmf_test_pages.py +++ b/lmfdb/classical_modular_forms/cmf_test_pages.py @@ -1,11 +1,11 @@ from lmfdb.tests import LmfdbTest from lmfdb.lmfdb_database import LMFDBDatabase +from lmfdb.logger import logger from sage.parallel.decorate import parallel from sage.all import ZZ, sqrt, ceil, gp import multiprocessing from traceback import print_exc -import logging import time ncpus = min(multiprocessing.cpu_count(), 10) @@ -40,9 +40,9 @@ def newform(self, label, dim): @parallel(ncpus=ncpus) def all_newforms(self, level, weight): - logging.getLogger().disabled = True + logger.disabled = True db = LMFDBDatabase() - logging.getLogger().disabled = False + logger.disabled = False res = [] errors = [] n = 0 @@ -62,9 +62,9 @@ def all_newforms(self, level, weight): @parallel(ncpus=ncpus) def all_newspaces(self, level, weight): - logging.getLogger().disabled = True + logger.disabled = True db = LMFDBDatabase() - logging.info.disabled = False + logger.disabled = False errors = [] res = [] n = 0 diff --git a/lmfdb/classical_modular_forms/test_cmf.py b/lmfdb/classical_modular_forms/test_cmf.py index 300cb585ba..602fafbaa5 100644 --- a/lmfdb/classical_modular_forms/test_cmf.py +++ b/lmfdb/classical_modular_forms/test_cmf.py @@ -2,9 +2,6 @@ from lmfdb.tests import LmfdbTest import unittest -from . import cmf_logger -cmf_logger.setLevel(100) - class CmfTest(LmfdbTest): def runTest(self): diff --git a/lmfdb/classical_modular_forms/test_cmf2.py b/lmfdb/classical_modular_forms/test_cmf2.py index edeca04c65..e8df6b453f 100644 --- a/lmfdb/classical_modular_forms/test_cmf2.py +++ b/lmfdb/classical_modular_forms/test_cmf2.py @@ -1,9 +1,6 @@ from lmfdb.tests import LmfdbTest -from . import cmf_logger -cmf_logger.setLevel(100) - class CmfTest(LmfdbTest): def runTest(self): diff --git a/lmfdb/cluster_pictures/__init__.py b/lmfdb/cluster_pictures/__init__.py index 78c1349c63..7037ef3daf 100644 --- a/lmfdb/cluster_pictures/__init__.py +++ b/lmfdb/cluster_pictures/__init__.py @@ -1,6 +1,2 @@ - - -# cp_logger = make_logger(cp_page) - from . import cluster_picture assert cluster_picture diff --git a/lmfdb/cluster_pictures/cluster_picture.py b/lmfdb/cluster_pictures/cluster_picture.py index 0b45cabc8a..ee38b7c6b1 100644 --- a/lmfdb/cluster_pictures/cluster_picture.py +++ b/lmfdb/cluster_pictures/cluster_picture.py @@ -5,8 +5,6 @@ from lmfdb.cluster_pictures.web_cluster_picture import ( cp_knowl_guts) -# assert cp_logger - CP_credit = 'Alex Best, Raymond van Bommel' Completename = 'Completeness of the data' dnc = 'data not computed' 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..863d20acb8 100644 --- a/lmfdb/crystals/main.py +++ b/lmfdb/crystals/main.py @@ -2,7 +2,8 @@ # 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 +from lmfdb.logger import logger 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..9dc1d13d8c 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,8 +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): # This is used in formatting stats, and we need it to process the output. diff --git a/lmfdb/ecnf/isog_class.py b/lmfdb/ecnf/isog_class.py index 291b75f1c5..6f3c931aab 100644 --- a/lmfdb/ecnf/isog_class.py +++ b/lmfdb/ecnf/isog_class.py @@ -1,15 +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", nf=c['field_label'], @@ -29,7 +26,6 @@ def __init__(self, dbdata): - dbdata: the data from the database """ - #logger.info("Constructing an instance of ECNF_isoclass") self.__dict__.update(dbdata) self.make_class() diff --git a/lmfdb/elliptic_curves/__init__.py b/lmfdb/elliptic_curves/__init__.py index e38094bef1..6d653050a6 100644 --- a/lmfdb/elliptic_curves/__init__.py +++ b/lmfdb/elliptic_curves/__init__.py @@ -1,11 +1,8 @@ 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..00dea18897 100644 --- a/lmfdb/elliptic_curves/elliptic_curve.py +++ b/lmfdb/elliptic_curves/elliptic_curve.py @@ -23,8 +23,9 @@ from lmfdb.utils.search_columns import SearchColumns, MathCol, LinkCol, ProcessedCol, MultiProcessedCol, CheckCol, FloatCol, ListCol from lmfdb.utils.common_regex import ZLLIST_RE from lmfdb.utils.web_display import dispZmat_from_list +from lmfdb.logger import logger 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 @@ -679,7 +680,7 @@ def by_triple_label(conductor,iso_label,number): @ec_page.route("/