make sure logs are truncated

This commit is contained in:
Love Hornquist Astrand
2012-10-07 11:11:17 -07:00
parent c707016669
commit 4ebfd6b818
15 changed files with 21 additions and 24 deletions

View File

@@ -98,7 +98,7 @@ ${kadmin} check ${R3} || exit 1
echo foo > ${objdir}/foopassword
echo "Starting kdc"
echo "Starting kdc" ; > messages.log
${kdc} &
kdcpid=$!

View File

@@ -87,7 +87,7 @@ ${kadmin} check ${R} || exit 1
echo foo > ${objdir}/foopassword
echo Starting kdc
echo Starting kdc ; > messages.log
${kdc} &
kdcpid=$!

View File

@@ -101,7 +101,7 @@ ${kadmin} check ${R4} || exit 1
echo foo > ${objdir}/foopassword
echo Starting kdc
echo Starting kdc; > messages.log
${kdc} &
kdcpid=$!

View File

@@ -95,7 +95,7 @@ ${kadmin} check ${R} || exit 1
echo foo > ${objdir}/foopassword
echo Starting kdc
echo Starting kdc; > messages.log
${kdc} &
kdcpid=$!

View File

@@ -93,7 +93,7 @@ ${kadmin} check ${R} || exit 1
echo $password > ${objdir}/foopassword
echo "Starting kdc"
echo "Starting kdc" ; > messages.log
env ${HEIM_MALLOC_DEBUG} ${kdc} &
kdcpid=$!

View File

@@ -85,7 +85,7 @@ ${kadmin} check ${R} || exit 1
echo foo > ${objdir}/foopassword
echo Starting kdc
echo Starting kdc ; > messages.log
env MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log \
${kdc} &
kdcpid=$!

View File

@@ -83,7 +83,7 @@ ${kadmin} ext -k ${keytab} ${server}@${R} || exit 1
echo foo > ${objdir}/foopassword
echo Starting kdc
echo Starting kdc ; > messages.log
env MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log \
${kdc} &
kdcpid=$!

View File

@@ -96,20 +96,20 @@ ipropd_slave="${ipropd_slave} --status-file=iprop-slave-status"
trap "echo 'killing ipropd s + m + kdc'; kill -9 \${ipdm} \${ipds} \${kdcpid} >/dev/null 2>/dev/null; tail messages.log ; tail iprop-stats; exit 1;" EXIT
echo Starting kdc
echo Starting kdc ; > messages.log
${kdc} &
kdcpid=$!
sh ${wait_kdc} || exit 1
echo "starting master"
echo "starting master" ; > messages.log
env ${HEIM_MALLOC_DEBUG} \
${ipropd_master} --hostname=localhost -k ${keytab} \
--database=${objdir}/current-db &
ipdm=$!
sh ${wait_kdc} ipropd-master || exit 1
echo "starting slave"
echo "starting slave" ; > messages.log
env ${HEIM_MALLOC_DEBUG} \
KRB5_CONFIG="${objdir}/krb5-slave.conf" \
${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
@@ -184,9 +184,8 @@ cp ${objdir}/current.log ${objdir}/current.log.tmp
# ----------------- checking: checking that master and slaves resyncs
echo "starting slave again"
echo "starting slave again" ; > messages.log
> iprop-stats
> messages.log
env ${HEIM_MALLOC_DEBUG} \
KRB5_CONFIG="${objdir}/krb5-slave.conf" \
${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
@@ -207,7 +206,7 @@ sleep 2
rm current.slave.log current-db.slave* || exit 1
> iprop-stats
rm -f iprop-slave-status
> messages.log
echo "starting slave" ; > messages.log
env ${HEIM_MALLOC_DEBUG} \
KRB5_CONFIG="${objdir}/krb5-slave.conf" \
${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
@@ -252,14 +251,14 @@ cmp master-last.tmp slave-last.tmp || exit 1
echo "Going back to old version of the master log file"
cp ${objdir}/current.log.tmp ${objdir}/current.log
echo "starting master"
echo "starting master" ; > messages.log
env ${HEIM_MALLOC_DEBUG} \
${ipropd_master} --hostname=localhost -k ${keytab} \
--database=${objdir}/current-db &
ipdm=$!
sh ${wait_kdc} ipropd-master || exit 1
echo "starting slave"
echo "starting slave" ; > messages.log
env ${HEIM_MALLOC_DEBUG} \
KRB5_CONFIG="${objdir}/krb5-slave.conf" \
${ipropd_slave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
@@ -294,7 +293,7 @@ kill -0 ${ipds} || { echo "slave no longer there"; exit 1; }
> messages.log
echo "Staring master again"
echo "Staring master again" ; > messages.log
env ${HEIM_MALLOC_DEBUG} \
${ipropd_master} --hostname=localhost -k ${keytab} \
--database=${objdir}/current-db &

View File

@@ -87,7 +87,7 @@ ${kadmin} -l modify --pkinit-acl="CN=baz,DC=test,DC=h5l,DC=se" pkinit@${R} || ex
echo foo > ${objdir}/foopassword
echo Starting kdc
echo Starting kdc ; > messages.log
${kdc} &
kdcpid=$!

View File

@@ -235,7 +235,7 @@ done
echo foo > ${objdir}/foopassword
echo Starting kdc
echo Starting kdc ; > messages.log
env MallocStackLogging=1 MallocStackLoggingNoCompact=1 MallocErrorAbort=1 MallocLogFile=${objdir}/malloc-log \
${kdc} &
kdcpid=$!

View File

@@ -101,7 +101,7 @@ ${kadmin} check ${R2} || exit 1
echo foo > ${objdir}/foopassword
echo Starting kdc
echo Starting kdc ; > messages.log
env ${HEIM_MALLOC_DEBUG} ${kdc} &
kdcpid=$!

View File

@@ -168,7 +168,7 @@ ${hxtool} issue-certificate \
echo foo > ${objdir}/foopassword
echo Starting kdc
echo Starting kdc ; > messages.log
${kdc} &
kdcpid=$!

View File

@@ -100,7 +100,7 @@ ${kadmin} check ${R2} || exit 1
echo foo > ${objdir}/foopassword
echo Starting kdc
echo Starting kdc ; > messages.log
${kdc} &
kdcpid=$!

View File

@@ -86,7 +86,7 @@ ${kadmin} check ${R} || exit 1
echo foo > ${objdir}/foopassword
echo Starting kdc
echo Starting kdc ; > messages.log
${kdc} &
kdcpid=$!

View File

@@ -40,8 +40,6 @@ waitsec=35
echo "Waiting for ${name} to start, looking logfile ${log}"
#echo "wait string: $waitfor"
while true ; do
if grep "${waitfor}" ${log} > /dev/null; then
break