ungleich-public/ccollect
6
0
Fork 1
Code Issues Pull requests 1 Projects Releases Wiki Activity

Update changelog, documentation and fix ccollect-logwrapper.sh

Browse source
This commit is contained in:
Nico Schottelius 2007-08-20 17:45:06 +02:00
parent 03a55f1b1f
commit e4969a390a
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/CHANGES
View file

@ -1,6 +1,7 @@
0.6 to 0.6.1: 0.6 to 0.6.1:
* Added check for destination_base in add_ccollect_source.sh * Added check for destination_base in add_ccollect_source.sh
* Add support for -V and --version * Add support for -V and --version
* Added ccollect-logwrapper.sh (and a manpage ;-)
0.5.2 to 0.6: 0.5.2 to 0.6:
* Always print return code of rsync * Always print return code of rsync

2
doc/ccollect.text
View file

@ -1,7 +1,7 @@
ccollect - Installing, Configuring and Using ccollect - Installing, Configuring and Using
============================================ ============================================
Nico Schottelius <nico-ccollect__@__schottelius.org> Nico Schottelius <nico-ccollect__@__schottelius.org>
0.6, for ccollect 0.6, Initial Version from 2006-01-13 0.6, for ccollect 0.6 - 0.6.1, Initial Version from 2006-01-13
:Author Initials: NS :Author Initials: NS

13
tools/ccollect-logwrapper.sh
View file

@ -12,7 +12,7 @@ LOGCONF=$CCOLLECT_CONF/logwrapper
logdir="${LOGCONF}/destination" logdir="${LOGCONF}/destination"
CDATE="date +%Y%m%d-%H%M" CDATE="date +%Y%m%d-%H%M"
we="$(basenae $0)" we="$(basename $0)"
pid=$$ pid=$$
logfile="${logdir}/$(${CDATE}).${pid}" logfile="${logdir}/$(${CDATE}).${pid}"
@ -21,8 +21,9 @@ logfile="${logdir}/$(${CDATE}).${pid}"
# Also use echo, can be redirected with > /dev/null if someone cares # Also use echo, can be redirected with > /dev/null if someone cares
_echo() _echo()
{ {
logger "${we}-${pid}: $@" string="${we} (${pid}): $@"
echo "${we}-${pid}: $@" logger "${string}"
echo "${string}"
} }
@ -37,5 +38,9 @@ _exit_err()
# put everything into that specified file # put everything into that specified file
_echo "Starting with arguments: $@" _echo "Starting with arguments: $@"
touch "${logfile}" || _exit_err "Failed to create ${logfile}" touch "${logfile}" || _exit_err "Failed to create ${logfile}"
ccollect.sh "$@" > "${logfile}" 2>&1
# First line in the logfile is always the commandline
echo ccollect.sh "$@" > "${logfile}" 2>&1
ccollect.sh "$@" >> "${logfile}" 2>&1
_echo "Finished." _echo "Finished."