Merge remote-tracking branch 'origin/master'

server/nightr/app.py

@@ -1,18 +1,17 @@
 import inspect
-import logging
 import statistics
 from dataclasses import asdict
 from datetime import timedelta
 from typing import List
 
 import requests_cache
-from flask import Flask, jsonify
+from flask import Flask, jsonify, logging
 
 from .strategies import miloStrats, iss, cars_in_traffic, tide_strat, upstairs_neighbour
 from .util import Context
 
-logger = logging.getLogger(__name__)
 app = Flask(__name__)
+logger = logging.create_logger(app)
 
 requests_cache.install_cache("requests_cache", expire_after=timedelta(minutes=10))
 
@@ -39,9 +38,10 @@ def probabilities():
         try:
             prediction = strategy(context)
         except Exception as e:
-            logger.warning("Strategy %s failed: %s", name, e)
+            logger.warning("Strategy '%s' failed:", name)
             logger.exception(e)
             continue
+
         predictions.append({
             "name": name,
             "description": inspect.getdoc(strategy),

server/nightr/strategies/iss.py

@@ -9,7 +9,6 @@ from timezonefinder import TimezoneFinder
 
 from ..util import Context, Prediction
 
-logger = logging.getLogger(__name__)
 tf = TimezoneFinder(in_memory=True)