summaryrefslogtreecommitdiff
path: root/frontend/cgi/live-build-cgi.cron
diff options
context:
space:
mode:
authorRichard Nelson <unixabg@gmail.com>2013-09-17 11:42:51 -0500
committerRichard Nelson <unixabg@gmail.com>2013-09-17 11:42:51 -0500
commit4a5d67c5b8408be17c4bb5e7879a54df6ae00cd9 (patch)
tree63222e8be08f9870c6e32c7c35301d7cb46d5b43 /frontend/cgi/live-build-cgi.cron
parentf880117b97e760fad9140af4ca1548c764f58551 (diff)
downloadvyos-live-build-4a5d67c5b8408be17c4bb5e7879a54df6ae00cd9.tar.gz
vyos-live-build-4a5d67c5b8408be17c4bb5e7879a54df6ae00cd9.zip
Modify l-b-cgi frontend logging paths.
Diffstat (limited to 'frontend/cgi/live-build-cgi.cron')
-rwxr-xr-xfrontend/cgi/live-build-cgi.cron12
1 files changed, 6 insertions, 6 deletions
diff --git a/frontend/cgi/live-build-cgi.cron b/frontend/cgi/live-build-cgi.cron
index bd2694d8f..ea57a5da2 100755
--- a/frontend/cgi/live-build-cgi.cron
+++ b/frontend/cgi/live-build-cgi.cron
@@ -54,7 +54,7 @@ if ls "${_DESTDIR}"/`date -d yesterday +%Y%m%d.%H`* > /dev/null 2>&1
then
rm -rf "${_DESTDIR}"/`date -d yesterday +%Y%m%d.%H`*
- echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: remove web build (`date -d yesterday +%Y%m%d.%H`*)." >> /var/log/live
+ echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: remove web build (`date -d yesterday +%Y%m%d.%H`*)." >> /var/log/live/live-build
fi
# Ok from here spin through the live-build-cgi files we have waiting to build
@@ -66,10 +66,10 @@ then
. "${_FILE}"
# Drop out some build data for information if something goes wrong.
- echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live
+ echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live/live-build
# Clone the git config to target build directory
- git clone ${_LB_GIT} "${_TEMPDIR}"/"${_BUILD}" >> /var/log/live
+ git clone ${_LB_GIT} "${_TEMPDIR}"/"${_BUILD}" >> /var/log/live/live-build
_ERRORGIT="${?}"
# Moving build file to the tempdir and remove from submission area.
@@ -129,10 +129,10 @@ then
if [ "${_ERRORGIT}" -eq "0" ] && [ "${_ERRORCONFIG}" -eq "0" ] && [ "${_ERRORBUILD}" -eq "0" ]
then
_STATUS="maybe-successful"
- echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LIVE_IMAGE_ARCHITECTURE}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 200 - \"-\" \"\"">>/var/log/live-cgi.builds
+ echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LIVE_IMAGE_ARCHITECTURE}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 200 - \"-\" \"\"">>/var/log/live/live-build-cgi-status
else
_STATUS="maybe-failed"
- echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LIVE_IMAGE_ARCHITECTURE}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 404 - \"-\" \"\"">>/var/log/live-cgi.builds
+ echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LIVE_IMAGE_ARCHITECTURE}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 404 - \"-\" \"\"">>/var/log/live/live-build-cgi-status
fi
sed -e "s/BUILD/${_BUILD}/g" \
@@ -204,5 +204,5 @@ EOF
# Removing build directory
rm -rf "${_TEMPDIR}"/"${_BUILD}"
- echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: end web build (${_BUILD}: ${_STATUS})." >> /var/log/live
+ echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: end web build (${_BUILD}: ${_STATUS})." >> /var/log/live/live-build
fi