diff options
| author | Richard Nelson <unixabg@gmail.com> | 2015-04-17 14:21:08 -0500 |
|---|---|---|
| committer | Richard Nelson <unixabg@gmail.com> | 2015-04-17 14:21:08 -0500 |
| commit | b8cc61dfd74f4236aaf59b461be0f861c08124b8 (patch) | |
| tree | 36c7cce273eb92b688a7ce87f0a07ad33b17e545 | |
| parent | c73e1ed5a5df055ffada57bd3753a5bc399e9ec0 (diff) | |
| download | vyos-live-build-b8cc61dfd74f4236aaf59b461be0f861c08124b8.tar.gz vyos-live-build-b8cc61dfd74f4236aaf59b461be0f861c08124b8.zip | |
Added output of processing builds to status page for l-b-cgi frontend.
| -rwxr-xr-x | frontend/cgi/live-build-status-cgi | 4 | ||||
| -rw-r--r-- | templates/cgi/debian/status.html | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/frontend/cgi/live-build-status-cgi b/frontend/cgi/live-build-status-cgi index 80ea39812..8af58572a 100755 --- a/frontend/cgi/live-build-status-cgi +++ b/frontend/cgi/live-build-status-cgi @@ -70,6 +70,9 @@ else # Getting number of builds pending. _QUEUENUM=$(ls "${_TEMPDIR}"/*.build | wc -l) + # Getting number of builds processing. + _PNUM=$(ls "${_TEMPDIR}"/*/ | wc -l) + # Find the build if exists and populate status html else respond no build. #echo "${QUERY_STRING}" if [ -f "${_TEMPDIR}"/"${_CGI_BUILD}".build ] @@ -103,6 +106,7 @@ else -e "s/EMAIL/${_EMAIL}/" \ -e "s/STATUS/${_STATUS}/" \ -e "s/QUEUENUM/${_QUEUENUM}/" \ + -e "s/PNUM/${_PNUM}/" \ -e "s/LB_BINARY_IMAGES/${LB_BINARY_IMAGES}/" \ -e "s/LB_DISTRIBUTION/${LB_DISTRIBUTION}/" \ -e "s#_LB_CONFIG#${_LB_CONFIG}#" \ diff --git a/templates/cgi/debian/status.html b/templates/cgi/debian/status.html index a9f7e30b1..2094022b2 100644 --- a/templates/cgi/debian/status.html +++ b/templates/cgi/debian/status.html @@ -1,6 +1,6 @@ <br /> -<h3>Build 'BUILD' shows a status of <b>STATUS</b>. Depending on the options you have selected, upon build showing a status of running it generally takes between 5 and 60 minutes to complete. Currently there are 'QUEUENUM' pending build(s) request waiting to be processed on the server. You will be notified by email when the attempt has completed.</h3> +<h3>Build 'BUILD' shows a status of <b>STATUS</b>. Depending on the options you have selected, upon build showing a status of running it generally takes between 5 and 60 minutes to complete. Currently there are 'PNUM' build(s) being processed and 'QUEUENUM' pending build(s) waiting to be processed on the server. You will be notified by email when the attempt has completed.</h3> <h3>Your build when completed will be available at: <a href="SERVER/BUILD/">SERVER/BUILD/</a>.</h3> |