Macintosh-HW
/
RASCSI
mirror of https://github.com/akuker/RASCSI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add support for --log-level argument to web UI (#781) 

Increase verbosity of web UI log format

Add critical to supported log levels for completeness
This commit is contained in:
nucleogenic 2022-08-01 01:02:14 +01:00 committed by GitHub
parent a09885cdfe
commit 7a18939171
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
python/web/src/web.py
View File

@ -2,6 +2,7 @@
Module for the Flask app rendering and endpoints Module for the Flask app rendering and endpoints
""" """
import sys
import logging import logging
import argparse import argparse
from pathlib import Path from pathlib import Path
@ -1028,14 +1029,23 @@ if __name__ == "__main__":
default="localhost", default="localhost",
action="store", action="store",
help="RaSCSI host. Default: localhost", help="RaSCSI host. Default: localhost",
) )
parser.add_argument( parser.add_argument(
"--rascsi-port", "--rascsi-port",
type=int, type=int,
default=6868, default=6868,
action="store", action="store",
help="RaSCSI port. Default: 6868", help="RaSCSI port. Default: 6868",
) )
parser.add_argument(
"--log-level",
type=str,
default="warning",
action="store",
help="Log level for Web UI. Default: warning",
choices=["debug", "info", "warning", "error", "critical"],
)
arguments = parser.parse_args() arguments = parser.parse_args()
APP.config["TOKEN"] = arguments.password APP.config["TOKEN"] = arguments.password
@ -1047,5 +1057,9 @@ if __name__ == "__main__":
if Path(f"{CFG_DIR}/{DEFAULT_CONFIG}").is_file(): if Path(f"{CFG_DIR}/{DEFAULT_CONFIG}").is_file():
file_cmd.read_config(DEFAULT_CONFIG) file_cmd.read_config(DEFAULT_CONFIG)
logging.basicConfig(stream=sys.stdout,
format="%(asctime)s %(levelname)s %(filename)s:%(lineno)s %(message)s",
level=arguments.log_level.upper())
print("Serving rascsi-web...") print("Serving rascsi-web...")
bjoern.run(APP, "0.0.0.0", arguments.port) bjoern.run(APP, "0.0.0.0", arguments.port)

5
python/web/start.sh
View File

@ -102,6 +102,9 @@ while [ "$1" != "" ]; do
-o | --rascsi-port) -o | --rascsi-port)
ARG_RASCSI_PORT="--rascsi-port $VALUE" ARG_RASCSI_PORT="--rascsi-port $VALUE"
;; ;;
-l | --log-level)
ARG_LOG_LEVEL="--log-level $VALUE"
;;
*) *)
echo "ERROR: unknown parameter \"$PARAM\"" echo "ERROR: unknown parameter \"$PARAM\""
exit 1 exit 1
@ -114,4 +117,4 @@ PYTHON_COMMON_PATH=$(dirname $PWD)/common/src
echo "Starting web server for RaSCSI Web Interface..." echo "Starting web server for RaSCSI Web Interface..."
export PYTHONPATH=$PWD/src:${PYTHON_COMMON_PATH} export PYTHONPATH=$PWD/src:${PYTHON_COMMON_PATH}
cd src cd src
python3 web.py ${ARG_PORT} ${ARG_PASSWORD} ${ARG_RASCSI_HOST} ${ARG_RASCSI_PORT} python3 web.py ${ARG_PORT} ${ARG_PASSWORD} ${ARG_RASCSI_HOST} ${ARG_RASCSI_PORT} ${ARG_LOG_LEVEL}