More verbose status reporting using key=value format. We now also

report error status, architecture and OS version, and available build
environments, as well as load and number of running jobs

1 files changed, 18 insertions, 8 deletions

diff --git a/Tools/portbuild/scripts/reportload b/Tools/portbuild/scripts/reportload
index 4da964b1b7bc..130348eceb5c 100755
--- a/Tools/portbuild/scripts/reportload
+++ b/Tools/portbuild/scripts/reportload
@@ -5,6 +5,7 @@
 # configurable variables
 pb=/var/portbuild
 arch=$(uname -m)
+osver=$(sysctl -n kern.osreldate)
 
 . ${pb}/${arch}/portbuild.conf
 if [ -f ${pb}/${arch}/portbuild.$(hostname) ]; then
@@ -12,18 +13,27 @@ if [ -f ${pb}/${arch}/portbuild.$(hostname) ]; then
 fi
 
 # Look for exceptional conditions
-error=0
+error=
 for i in squid disk; do
   if [ -f ${scratchdir}/.${i} ]; then
-    error=1
+    error=${i} "${error}"
   fi
 done
 
-if [ ${error} = 0 ]; then
-  num=$(echo $(ls -1d ${scratchdir}/*/*/used ${scratchdir}/*/chroot/*/used 2>/dev/null| wc -l))
-else
-  num=ERR
-fi
+num=$(echo $(ls -1d ${scratchdir}/*/*/*/used ${scratchdir}/*/*/chroot/*/used 2>/dev/null| wc -l))
+
+echo "arch=${arch}"
+echo "osversion=${osver}"
+echo "jobs=${num}"
 
-echo -n "$num "
+cd /var/portbuild/${arch}
+for i in */builds/*; do
+    buildenv=${arch}/${i%%/*}/${i##*/}
+    if [ -f ${i}/.ready ]; then
+	buildenvs="${buildenv} ${buildenvs}"
+    fi
+done
+echo "buildenvs=${buildenvs}"
+echo -n "load="
 uptime
+echo "error=${error}"
\ No newline at end of file