Skip to content

log levels: default INFO, remove ALL #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

log levels: default INFO, remove ALL #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CHANGELOG
## Monitor
^^^^^^^^^^

- Bot logs: fix log level filter "ALL" (PR#49 by Sebastian Wagner, fixes #48).
- Bot logs: Remove log level filter "ALL", use INFO as default (PR#51, PR#49 by Sebastian Wagner, fixes #48).

Tests
^^^^^
Expand All @@ -22,7 +22,7 @@ Tests
3.3.0 (2024-03-01)
----------------------

- Bump version number to be in sync with the main intelmq version
- Bump version number to be in sync with the main intelmq version
- minor fixes to re-enable all the github workflows and disable the workflows which did not run anymore.

3.2.0 (2023-07-19)
Expand Down
2 changes: 1 addition & 1 deletion intelmq_api/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def bot(action: Actions, id: str = Depends(ID), runner: runctl.RunIntelMQCtl = D


@api.get("/api/getlog", dependencies=[authorized, cached])
def get_log(lines: int, id: str = Depends(ID), level: Levels = "DEBUG",
def get_log(lines: int, id: str = Depends(ID), level: Levels = "INFO",
runner: runctl.RunIntelMQCtl = Depends(runner)):
return JSONFileResponse(runner.log(id, lines, level))

Expand Down
2 changes: 0 additions & 2 deletions intelmq_api/runctl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ def bot(self, action: str, bot_id: str) -> JSONFile:
return self._run_json([action, bot_id])

def log(self, bot_id: str, lines: int, level: str) -> JSONFile:
if level == "ALL":
return self._run_json(["log", bot_id, str(lines)])
return self._run_json(["log", bot_id, str(lines), level])

def list(self, kind: str) -> JSONFile:
Expand Down