diff options
Diffstat (limited to 'bitbake/bin/toaster')
-rwxr-xr-x | bitbake/bin/toaster | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 6b90ee187e..f002c8c159 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster | |||
@@ -33,7 +33,7 @@ databaseCheck() | |||
33 | $MANAGE migrate --noinput || retval=1 | 33 | $MANAGE migrate --noinput || retval=1 |
34 | 34 | ||
35 | if [ $retval -eq 1 ]; then | 35 | if [ $retval -eq 1 ]; then |
36 | echo "Failed migrations, aborting system start" 1>&2 | 36 | echo "Failed migrations, halting system start" 1>&2 |
37 | return $retval | 37 | return $retval |
38 | fi | 38 | fi |
39 | # Make sure that checksettings can pick up any value for TEMPLATECONF | 39 | # Make sure that checksettings can pick up any value for TEMPLATECONF |
@@ -41,7 +41,7 @@ databaseCheck() | |||
41 | $MANAGE checksettings --traceback || retval=1 | 41 | $MANAGE checksettings --traceback || retval=1 |
42 | 42 | ||
43 | if [ $retval -eq 1 ]; then | 43 | if [ $retval -eq 1 ]; then |
44 | printf "\nError while checking settings; aborting\n" | 44 | printf "\nError while checking settings; exiting\n" |
45 | return $retval | 45 | return $retval |
46 | fi | 46 | fi |
47 | 47 | ||
@@ -84,7 +84,7 @@ webserverStartAll() | |||
84 | echo "Starting webserver..." | 84 | echo "Starting webserver..." |
85 | 85 | ||
86 | $MANAGE runserver --noreload "$ADDR_PORT" \ | 86 | $MANAGE runserver --noreload "$ADDR_PORT" \ |
87 | </dev/null >>${BUILDDIR}/toaster_web.log 2>&1 \ | 87 | </dev/null >>${TOASTER_LOGS_DIR}/web.log 2>&1 \ |
88 | & echo $! >${BUILDDIR}/.toastermain.pid | 88 | & echo $! >${BUILDDIR}/.toastermain.pid |
89 | 89 | ||
90 | sleep 1 | 90 | sleep 1 |
@@ -181,6 +181,14 @@ WEBSERVER=1 | |||
181 | export TOASTER_BUILDSERVER=1 | 181 | export TOASTER_BUILDSERVER=1 |
182 | ADDR_PORT="localhost:8000" | 182 | ADDR_PORT="localhost:8000" |
183 | TOASTERDIR=`dirname $BUILDDIR` | 183 | TOASTERDIR=`dirname $BUILDDIR` |
184 | # ${BUILDDIR}/toaster_logs/ became the default location for toaster logs | ||
185 | # This is needed for implemented django-log-viewer: https://pypi.org/project/django-log-viewer/ | ||
186 | # If the directory does not exist, create it. | ||
187 | TOASTER_LOGS_DIR="${BUILDDIR}/toaster_logs/" | ||
188 | if [ ! -d $TOASTER_LOGS_DIR ] | ||
189 | then | ||
190 | mkdir $TOASTER_LOGS_DIR | ||
191 | fi | ||
184 | unset CMD | 192 | unset CMD |
185 | for param in $*; do | 193 | for param in $*; do |
186 | case $param in | 194 | case $param in |
@@ -248,7 +256,7 @@ fi | |||
248 | # 3) the sqlite db if that is being used. | 256 | # 3) the sqlite db if that is being used. |
249 | # 4) pid's we need to clean up on exit/shutdown | 257 | # 4) pid's we need to clean up on exit/shutdown |
250 | export TOASTER_DIR=$TOASTERDIR | 258 | export TOASTER_DIR=$TOASTERDIR |
251 | export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE TOASTER_DIR" | 259 | export BB_ENV_PASSTHROUGH_ADDITIONS="$BB_ENV_PASSTHROUGH_ADDITIONS TOASTER_DIR" |
252 | 260 | ||
253 | # Determine the action. If specified by arguments, fine, if not, toggle it | 261 | # Determine the action. If specified by arguments, fine, if not, toggle it |
254 | if [ "$CMD" = "start" ] ; then | 262 | if [ "$CMD" = "start" ] ; then |
@@ -299,7 +307,7 @@ case $CMD in | |||
299 | export BITBAKE_UI='toasterui' | 307 | export BITBAKE_UI='toasterui' |
300 | if [ $TOASTER_BUILDSERVER -eq 1 ] ; then | 308 | if [ $TOASTER_BUILDSERVER -eq 1 ] ; then |
301 | $MANAGE runbuilds \ | 309 | $MANAGE runbuilds \ |
302 | </dev/null >>${BUILDDIR}/toaster_runbuilds.log 2>&1 \ | 310 | </dev/null >>${TOASTER_LOGS_DIR}/toaster_runbuilds.log 2>&1 \ |
303 | & echo $! >${BUILDDIR}/.runbuilds.pid | 311 | & echo $! >${BUILDDIR}/.runbuilds.pid |
304 | else | 312 | else |
305 | echo "Toaster build server not started." | 313 | echo "Toaster build server not started." |