Tweaking the output of update-db to better see what's being done.
- Legacy-Id: 384
This commit is contained in:
parent
90a414fb10
commit
44da4d5f7c
|
@ -10,6 +10,7 @@ progdir=${0%/*}
|
||||||
|
|
||||||
cd $progdir/..
|
cd $progdir/..
|
||||||
build=$PWD
|
build=$PWD
|
||||||
|
state=/var/local/$program
|
||||||
|
|
||||||
function log() { logger -i -t $program -s "$*"; }
|
function log() { logger -i -t $program -s "$*"; }
|
||||||
function die() { log "$*; terminating."; echo "$program: Error: $*" 1>&2; exit 1; }
|
function die() { log "$*; terminating."; echo "$program: Error: $*" 1>&2; exit 1; }
|
||||||
|
@ -18,13 +19,18 @@ function die() { log "$*; terminating."; echo "$program: Error: $*" 1>&2; exit 1
|
||||||
[ $DBDUMP ] || DBDUMP="$1"
|
[ $DBDUMP ] || DBDUMP="$1"
|
||||||
[ $DBDUMP ] || DBDUMP=/www/tools.ietf.org/events/raw/sqldump/sqldump.raw
|
[ $DBDUMP ] || DBDUMP=/www/tools.ietf.org/events/raw/sqldump/sqldump.raw
|
||||||
[ $DBFIX ] || DBFIX=$build/test/sql_fixup.sql
|
[ $DBFIX ] || DBFIX=$build/test/sql_fixup.sql
|
||||||
[ $DBTIME ] || DBTIME=$build/update-db.time
|
[ $DBTIME ] || DBTIME=$state/update-db.time
|
||||||
|
[ $DBDONE ] || DBDONE=$state/update-db.done
|
||||||
|
|
||||||
LOCKDIR=/var/lock/ietfdb
|
LOCKDIR=/var/lock/ietfdb
|
||||||
PIDFILE=$LOCKDIR/pid
|
PIDFILE=$LOCKDIR/pid
|
||||||
|
|
||||||
while true; do
|
while true; do
|
||||||
if mkdir $LOCKDIR; then
|
if mkdir $LOCKDIR; then
|
||||||
|
echo ""
|
||||||
|
date +"Time: %Y-%m-%d %H:%M"
|
||||||
|
log "Database dump file is from $(date -r $DBDUMP +'%Y-%m-%d %H:%M')."
|
||||||
|
log "Last update done $(date -r $DBDONE +'%Y-%m-%d %H:%M')."
|
||||||
if [ $DBDUMP -nt $DBTIME ]; then
|
if [ $DBDUMP -nt $DBTIME ]; then
|
||||||
echo "$$" > $PIDFILE
|
echo "$$" > $PIDFILE
|
||||||
log "Updating local database from $DBDUMP ..."
|
log "Updating local database from $DBDUMP ..."
|
||||||
|
@ -34,9 +40,10 @@ while true; do
|
||||||
log "Running Django syncdb ..."
|
log "Running Django syncdb ..."
|
||||||
python ietf/manage.py syncdb
|
python ietf/manage.py syncdb
|
||||||
touch -r $DBDUMP $DBTIME
|
touch -r $DBDUMP $DBTIME
|
||||||
|
touch $DBDONE
|
||||||
log "Done."
|
log "Done."
|
||||||
else
|
else
|
||||||
log "Database dump not newer than at previous update. Quitting."
|
log "No new database dump available."
|
||||||
fi
|
fi
|
||||||
rm -rf $LOCKDIR
|
rm -rf $LOCKDIR
|
||||||
exit 0
|
exit 0
|
||||||
|
|
Loading…
Reference in a new issue