Skip to content

Commit

Permalink
Replace print by the Python logging framework
Browse files Browse the repository at this point in the history
Log messages with level >= ERROR give an event log
message.

Also: move scheduler to a separate file scheduler.py.
  • Loading branch information
vdbergh committed Jun 13, 2024
1 parent 322eea2 commit 2bb0a68
Show file tree
Hide file tree
Showing 9 changed files with 310 additions and 292 deletions.
10 changes: 7 additions & 3 deletions server/development.ini
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ port = 6542
keys = root, fishtest

[handlers]
keys = console
keys = console, events

[formatters]
keys = generic
Expand All @@ -49,7 +49,7 @@ handlers = console

[logger_fishtest]
level = DEBUG
handlers =
handlers = events
qualname = fishtest

[handler_console]
Expand All @@ -58,5 +58,9 @@ args = (sys.stderr,)
level = NOTSET
formatter = generic

[handler_events]
class = fishtest.rundb.EventHandler
formatter = generic

[formatter_generic]
format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
format = %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
13 changes: 5 additions & 8 deletions server/fishtest/actiondb.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import logging
from datetime import datetime, timezone

from fishtest.schemas import action_schema
from fishtest.util import hex_print, worker_name
from pymongo import DESCENDING
from vtjson import ValidationError, validate

logger = logging.getLogger(__name__)


def run_name(run):
run_id = str(run["_id"])
Expand Down Expand Up @@ -219,13 +222,7 @@ def insert_action(self, **action):
try:
validate(action_schema, action, "action")
except ValidationError as e:
message = (
f"Internal Error. Request {str(action)} does not validate: {str(e)}"
)
print(message, flush=True)
self.log_message(
username="fishtest.system",
message=message,
)
message = f"Request {str(action)} does not validate: {str(e)}"
logger.error(message)
return
self.actions.insert_one(action)
5 changes: 4 additions & 1 deletion server/fishtest/api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import base64
import copy
import io
import logging
import re
from datetime import datetime, timezone
from urllib.parse import urlparse
Expand All @@ -19,6 +20,8 @@
from pyramid.view import exception_view_config, view_config, view_defaults
from vtjson import ValidationError, validate

logger = logging.getLogger(__name__)

"""
Important note
==============
Expand Down Expand Up @@ -69,7 +72,7 @@ def handle_error(self, error, exception=HTTPBadRequest):
)
api = urlparse(full_url).path
error = f"{api}: {error}"
print(error, flush=True)
logger.info(error)
raise exception(self.add_time({"error": error}))


Expand Down
Loading

0 comments on commit 2bb0a68

Please sign in to comment.