Remove ability to modify logging levels

Summary: Logging levels were used inconsistently and would cause problems with multithreaded servers. We remove this ability. Test Plan: Tests updated.
facebookresearch · Feb 10, 2025 · 01d91b5 · 01d91b5
1 parent c024380
commit 01d91b5
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 21 deletions.
diff --git a/aepsych/benchmark/pathos_benchmark.py b/aepsych/benchmark/pathos_benchmark.py
@@ -25,7 +25,7 @@
 
 ctx._force_start_method("spawn")  # fixes problems with CUDA and fork
 
-logger = utils_logging.getLogger(logging.INFO)
+logger = utils_logging.getLogger()
 
 
 class PathosBenchmark(Benchmark):

diff --git a/aepsych/server/message_handlers/handle_ask.py b/aepsych/server/message_handlers/handle_ask.py
@@ -10,7 +10,7 @@
 
 import aepsych.utils_logging as utils_logging
 
-logger = utils_logging.getLogger(logging.INFO)
+logger = utils_logging.getLogger()
 
 
 def handle_ask(server, request):

diff --git a/aepsych/server/message_handlers/handle_can_model.py b/aepsych/server/message_handlers/handle_can_model.py
@@ -9,7 +9,7 @@
 
 import aepsych.utils_logging as utils_logging
 
-logger = utils_logging.getLogger(logging.INFO)
+logger = utils_logging.getLogger()
 
 
 def handle_can_model(server, request):

diff --git a/aepsych/server/message_handlers/handle_exit.py b/aepsych/server/message_handlers/handle_exit.py
@@ -9,7 +9,7 @@
 
 import aepsych.utils_logging as utils_logging
 
-logger = utils_logging.getLogger(logging.INFO)
+logger = utils_logging.getLogger()
 
 
 def handle_exit(server, request):

diff --git a/aepsych/server/message_handlers/handle_get_config.py b/aepsych/server/message_handlers/handle_get_config.py
@@ -8,7 +8,7 @@
 
 import aepsych.utils_logging as utils_logging
 
-logger = utils_logging.getLogger(logging.INFO)
+logger = utils_logging.getLogger()
 
 
 def handle_get_config(server, request):

diff --git a/aepsych/server/message_handlers/handle_info.py b/aepsych/server/message_handlers/handle_info.py
@@ -10,7 +10,7 @@
 
 import aepsych.utils_logging as utils_logging
 
-logger = utils_logging.getLogger(logging.INFO)
+logger = utils_logging.getLogger()
 
 
 def handle_info(server, request: Dict[str, Any]) -> Dict[str, Any]:

diff --git a/aepsych/server/message_handlers/handle_params.py b/aepsych/server/message_handlers/handle_params.py
@@ -9,7 +9,7 @@
 
 import aepsych.utils_logging as utils_logging
 
-logger = utils_logging.getLogger(logging.INFO)
+logger = utils_logging.getLogger()
 
 
 def handle_params(server, request):

diff --git a/aepsych/server/message_handlers/handle_query.py b/aepsych/server/message_handlers/handle_query.py
@@ -11,7 +11,7 @@
 import numpy as np
 import torch
 
-logger = utils_logging.getLogger(logging.INFO)
+logger = utils_logging.getLogger()
 
 
 def handle_query(server, request):

diff --git a/aepsych/server/message_handlers/handle_resume.py b/aepsych/server/message_handlers/handle_resume.py
@@ -9,7 +9,7 @@
 
 import aepsych.utils_logging as utils_logging
 
-logger = utils_logging.getLogger(logging.INFO)
+logger = utils_logging.getLogger()
 
 
 def handle_resume(server, request):

diff --git a/aepsych/server/message_handlers/handle_setup.py b/aepsych/server/message_handlers/handle_setup.py
@@ -14,7 +14,7 @@
 from aepsych.strategy import SequentialStrategy
 from aepsych.version import __version__
 
-logger = utils_logging.getLogger(logging.INFO)
+logger = utils_logging.getLogger()
 
 
 def _configure(server, config):

diff --git a/aepsych/server/message_handlers/handle_tell.py b/aepsych/server/message_handlers/handle_tell.py
@@ -15,7 +15,7 @@
 import pandas as pd
 import torch
 
-logger = utils_logging.getLogger(logging.INFO)
+logger = utils_logging.getLogger()
 DEFAULT_DESC = "default description"
 DEFAULT_NAME = "default name"
 

diff --git a/aepsych/server/replay.py b/aepsych/server/replay.py
@@ -12,7 +12,7 @@
 import pandas as pd
 from aepsych.server.message_handlers.handle_tell import flatten_tell_record
 
-logger = utils_logging.getLogger(logging.INFO)
+logger = utils_logging.getLogger()
 
 
 def replay(server, uuid_to_replay, skip_computations=False):

diff --git a/aepsych/server/server.py b/aepsych/server/server.py
@@ -33,7 +33,7 @@
 )
 from aepsych.strategy import SequentialStrategy, Strategy
 
-logger = utils_logging.getLogger(logging.INFO)
+logger = utils_logging.getLogger()
 
 
 def get_next_filename(folder, fname, ext):

diff --git a/aepsych/server/sockets.py b/aepsych/server/sockets.py
@@ -14,7 +14,7 @@
 import aepsych.utils_logging as utils_logging
 import numpy as np
 
-logger = utils_logging.getLogger(logging.INFO)
+logger = utils_logging.getLogger()
 BAD_REQUEST = "bad request"
 
 

diff --git a/aepsych/server/utils.py b/aepsych/server/utils.py
@@ -13,7 +13,7 @@
 import aepsych.database.db as db
 import aepsych.utils_logging as utils_logging
 
-logger = utils_logging.getLogger(logging.INFO)
+logger = utils_logging.getLogger()
 
 
 def get_next_filename(folder, fname, ext):

diff --git a/aepsych/utils_logging.py b/aepsych/utils_logging.py
@@ -35,7 +35,7 @@ def format(self, record):
         return formatter.format(record)
 
 
-def getLogger(level=logging.INFO, log_path: str = "logs") -> logging.Logger:
+def getLogger(log_path: str = "logs") -> logging.Logger:
     """Get a logger with the specified level and log path.
 
     Args:
@@ -53,7 +53,7 @@ def getLogger(level=logging.INFO, log_path: str = "logs") -> logging.Logger:
         "formatters": {"standard": {"()": ColorFormatter}},
         "handlers": {
             "default": {
-                "level": level,
+                "level": logging.INFO,
                 "class": "logging.StreamHandler",
                 "formatter": "standard",
             },
@@ -65,7 +65,11 @@ def getLogger(level=logging.INFO, log_path: str = "logs") -> logging.Logger:
             },
         },
         "loggers": {
-            "": {"handlers": ["default", "file"], "level": level, "propagate": False},
+            "": {
+                "handlers": ["default", "file"],
+                "level": logging.DEBUG,
+                "propagate": False,
+            },
         },
     }
 

diff --git a/tests/models/test_pairwise_probit.py b/tests/models/test_pairwise_probit.py
@@ -495,7 +495,7 @@ def test_hyperparam_consistency(self):
 class PairwiseProbitModelServerTest(unittest.TestCase):
     def setUp(self):
         # setup logger
-        server.logger = utils_logging.getLogger(logging.DEBUG, "logs")
+        server.logger = utils_logging.getLogger("logs")
         # random datebase path name without dashes
         database_path = "./{}.db".format(str(uuid.uuid4().hex))
         self.s = server.AEPsychServer(database_path=database_path)

diff --git a/tests/server/test_server.py b/tests/server/test_server.py
@@ -86,7 +86,7 @@ async def asyncSetUp(self):
         port = 5555
 
         # setup logger
-        server.logger = utils_logging.getLogger(logging.DEBUG, "logs")
+        server.logger = utils_logging.getLogger("unittests")
 
         # random datebase path name without dashes
         database_path = self.database_path

diff --git a/tests/test_datafetcher.py b/tests/test_datafetcher.py
@@ -96,7 +96,7 @@ def pre_seed_config(
 
     def setUp(self):
         # setup logger
-        server.logger = utils_logging.getLogger(logging.DEBUG, "logs")
+        server.logger = utils_logging.getLogger("logs")
 
         database_path = Path(__file__).parent / "test_databases" / "1000_outcome.db"