diff options
| -rwxr-xr-x | bitbake/bin/toaster | 9 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastermain/logs.py | 6 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastermain/settings.py | 7 |
3 files changed, 15 insertions, 7 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 558a819570c..195386de349 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster @@ -84,7 +84,7 @@ webserverStartAll() echo "Starting webserver..." $MANAGE runserver --noreload "$ADDR_PORT" \ - </dev/null >>${BUILDDIR}/toaster_web.log 2>&1 \ + </dev/null >>${BUILDDIR}/toaster_logs/toaster_web.log 2>&1 \ & echo $! >${BUILDDIR}/.toastermain.pid sleep 1 @@ -250,6 +250,11 @@ fi export TOASTER_DIR=$TOASTERDIR export BB_ENV_PASSTHROUGH_ADDITIONS="$BB_ENV_PASSTHROUGH_ADDITIONS TOASTER_DIR" +# Create the toaster_logs directory for django log_viewer +if [ ! -d ${BUILDDIR}/toaster_logs ]; then + mkdir "${BUILDDIR}/toaster_logs" +fi + # Determine the action. If specified by arguments, fine, if not, toggle it if [ "$CMD" = "start" ] ; then if [ -n "$BBSERVER" ]; then @@ -299,7 +304,7 @@ case $CMD in export BITBAKE_UI='toasterui' if [ $TOASTER_BUILDSERVER -eq 1 ] ; then $MANAGE runbuilds \ - </dev/null >>${BUILDDIR}/toaster_runbuilds.log 2>&1 \ + </dev/null >>${BUILDDIR}/toaster_logs/toaster_runbuilds.log 2>&1 \ & echo $! >${BUILDDIR}/.runbuilds.pid else echo "Toaster build server not started." diff --git a/bitbake/lib/toaster/toastermain/logs.py b/bitbake/lib/toaster/toastermain/logs.py index 5a296bc3f81..9d392fb4b8e 100644 --- a/bitbake/lib/toaster/toastermain/logs.py +++ b/bitbake/lib/toaster/toastermain/logs.py @@ -109,7 +109,7 @@ LOGGING_SETTINGS = { 'file_django': { 'level': 'INFO', 'class': 'logging.handlers.TimedRotatingFileHandler', - 'filename': BUILDDIR / 'toaster_django.log', + 'filename': BUILDDIR / 'toaster_logs/toaster_django.log', 'when': 'D', # interval type 'interval': 1, # defaults to 1 'backupCount': 10, # how many files to keep @@ -118,7 +118,7 @@ LOGGING_SETTINGS = { 'file_api': { 'level': 'INFO', 'class': 'logging.handlers.TimedRotatingFileHandler', - 'filename': BUILDDIR / 'toaster_api.log', + 'filename': BUILDDIR / 'toaster_logs/toaster_api.log', 'when': 'D', 'interval': 1, 'backupCount': 10, @@ -127,7 +127,7 @@ LOGGING_SETTINGS = { 'file_toaster': { 'level': 'INFO', 'class': 'logging.handlers.TimedRotatingFileHandler', - 'filename': BUILDDIR / 'toaster.log', + 'filename': BUILDDIR / 'toaster_logs/toaster.log', 'when': 'D', 'interval': 1, 'backupCount': 10, diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py index c1c1bb190b3..20e86fb0b9e 100644 --- a/bitbake/lib/toaster/toastermain/settings.py +++ b/bitbake/lib/toaster/toastermain/settings.py @@ -321,8 +321,11 @@ BUILDDIR = os.environ.get("BUILDDIR") # LOG VIEWER # https://pypi.org/project/django-log-viewer/ -LOG_VIEWER_FILES_PATTERN = 'toast*.log*' -LOG_VIEWER_FILES_DIR = Path(os.environ.get('BUILDDIR', '/tmp')) +LOG_VIEWER_FILES_PATTERN = '*.log*' +LOG_VIEWER_FILES_DIR = os.path.join(os.environ.get('BUILDDIR', '/tmp'), 'toaster_logs') +print("******************") +print(LOG_VIEWER_FILES_DIR) +print("******************") LOG_VIEWER_PAGE_LENGTH = 25 # total log lines per-page LOG_VIEWER_MAX_READ_LINES = 100000 # total log lines will be read LOG_VIEWER_PATTERNS = ['INFO', 'DEBUG', 'WARNING', 'ERROR', 'CRITICAL'] |