Skip to contentSkip to conversation

toaster: cummulative 021518 patch

PATCH In review David Reyna 1 participant 6 messages Feb 16, 2018 – Mar 26, 2018

lore
Share & tools
lore
#0 lore raw

cover toaster: cummulative 021518 patch

From: David Reyna <[email protected]>

This patchset addresses two blocking issues for Toaster.

The following changes since commit f51f28b7b927fde9489e244cb812b562f28bbafa:

icecc-create-env: Allow multiple tool aliases (2018-02-15 13:28:54 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib dreyna/submit/dreyna/toaster/cummulative_021518_patch
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dreyna/submit/dreyna/toaster/cummulative_021518_patch

David Reyna (2):
toaster: do not fail on optional 'custom.xml' file
Toaster: fix shutdown and extra threads

 bin/toaster                                                 | 4 ++--
 lib/toaster/bldcontrol/management/commands/checksettings.py | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/2 toaster: do not fail on optional 'custom.xml' file

From: David Reyna <[email protected]>

Explicitly capture and ignore errors when trying to load the optional 'custom.xml' fixture file.

[YOCTO #12554]

---
 lib/toaster/bldcontrol/management/commands/checksettings.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
lib/toaster/bldcontrol/management/commands/checksettings.py +4 -1
index 582114a..823c6f1 100644
@@ -107,7 +107,10 @@ class Command(BaseCommand):
                                 action="ignore",
                                 message="^.*No fixture named.*$")
                             print("Importing custom settings if present")
-                            call_command("loaddata", "custom")
+                            try:
+                                call_command("loaddata", "custom")
+                            except:
+                                print("NOTE: optional fixture 'custom' not found")
 
                         # we run lsupdates after config update
                         print("\nFetching information from the layer index, "
Signature · 1 line
2.7.4
#2 lore raw

Re: [PATCH 1/2] toaster: do not fail on optional 'custom.xml' file

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of David Reyna
Sent: Thursday, February 15, 2018 8:26 PM
To: [email protected]
Subject: [bitbake-devel] [PATCH 1/2] toaster: do not fail on optional 'custom.xml' file

From: David Reyna <[email protected]>

Explicitly capture and ignore errors when trying to load the optional 'custom.xml' fixture file.

[YOCTO #12554]

---
 lib/toaster/bldcontrol/management/commands/checksettings.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
lib/toaster/bldcontrol/management/commands/checksettings.py +4 -1
index 582114a..823c6f1 100644
@@ -107,7 +107,10 @@ class Command(BaseCommand):
                                 action="ignore",
                                 message="^.*No fixture named.*$")
                             print("Importing custom settings if present")
-                            call_command("loaddata", "custom")
+                            try:
+                                call_command("loaddata", "custom")
+                            except:
+                                print("NOTE: optional fixture 'custom' not found")
 
                         # we run lsupdates after config update
                         print("\nFetching information from the layer index, "
Signature · 7 lines
2.7.4

-- 
_______________________________________________
bitbake-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/bitbake-devel
#3 lore raw

PATCH 2/2 Toaster: fix shutdown and extra threads

In reply to David Reyna

From: David Reyna <[email protected]>

Fix typo in shutdown code to kill threads when "kill -0" is not enough. Use the '--noreload' flag for 'runserver' so that there are no extra and unaccounted threads.

[YOCTO #12555]

---
 bin/toaster | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
bin/toaster +2 -2
index 4036f0a..ed365ee 100755
@@ -68,7 +68,7 @@ webserverKillAll()
         if [ -f ${pidfile} ]; then
             pid=`cat ${pidfile}`
             while kill -0 $pid 2>/dev/null; do
-                kill -SIGTERM -$pid 2>/dev/null
+                kill -SIGTERM $pid 2>/dev/null
                 sleep 1
             done
             rm  ${pidfile}
@@ -91,7 +91,7 @@ webserverStartAll()
 
     echo "Starting webserver..."
 
-    $MANAGE runserver "$ADDR_PORT" \
+    $MANAGE runserver --noreload "$ADDR_PORT" \
            </dev/null >>${BUILDDIR}/toaster_web.log 2>&1 \
            & echo $! >${BUILDDIR}/.toastermain.pid
 
Signature · 1 line
2.7.4
#4 lore raw

Re: [PATCH 2/2] Toaster: fix shutdown and extra threads

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of David Reyna
Sent: Thursday, February 15, 2018 8:26 PM
To: [email protected]
Subject: [bitbake-devel] [PATCH 2/2] Toaster: fix shutdown and extra threads

From: David Reyna <[email protected]>

Fix typo in shutdown code to kill threads when "kill -0" is not enough.
Use the '--noreload' flag for 'runserver' so that there are no extra and unaccounted threads.

[YOCTO #12555]

---
 bin/toaster | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
bin/toaster +2 -2
index 4036f0a..ed365ee 100755
@@ -68,7 +68,7 @@ webserverKillAll()
         if [ -f ${pidfile} ]; then
             pid=`cat ${pidfile}`
             while kill -0 $pid 2>/dev/null; do
-                kill -SIGTERM -$pid 2>/dev/null
+                kill -SIGTERM $pid 2>/dev/null
                 sleep 1
             done
             rm  ${pidfile}
@@ -91,7 +91,7 @@ webserverStartAll()
 
     echo "Starting webserver..."
 
-    $MANAGE runserver "$ADDR_PORT" \
+    $MANAGE runserver --noreload "$ADDR_PORT" \
            </dev/null >>${BUILDDIR}/toaster_web.log 2>&1 \
            & echo $! >${BUILDDIR}/.toastermain.pid
 

--
2.7.4

--
_______________________________________________
bitbake-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/bitbake-devel

#5 lore raw

cover toaster: cummulative 021518 patch

In reply to David Reyna

This patch was yet not pulled. Trying again. Thanks.

-----Original Message-----
From: Reyna, David
Sent: Thursday, February 15, 2018 8:26 PM
To: [email protected]
Cc: Reyna, David
Subject: [PATCH 0/2] toaster: cummulative 021518 patch

From: David Reyna <[email protected]>

This patchset addresses two blocking issues for Toaster.

The following changes since commit f51f28b7b927fde9489e244cb812b562f28bbafa:

icecc-create-env: Allow multiple tool aliases (2018-02-15 13:28:54 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib dreyna/submit/dreyna/toaster/cummulative_021518_patch
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dreyna/submit/dreyna/toaster/cummulative_021518_patch

David Reyna (2):
toaster: do not fail on optional 'custom.xml' file
Toaster: fix shutdown and extra threads

 bin/toaster                                                 | 4 ++--
 lib/toaster/bldcontrol/management/commands/checksettings.py | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
Signature · 1 line
2.7.4