Remove an indirection

[dak.git] / config / debian / cron.dinstall

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 4c3613d507d17ed7c70630202540d3b48a611786..da0f78dce3622ba33709311126c0174fb93e5de2 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -253,9 +253,9 @@ mklslar                none                       mklslar                    fal
 mkfilesindices         none                       mkfilesindices             false   false
 mkchecksums            none                       mkchecksums                false   false
 mirror                 none                       mirror\ hardlinks          false   false
 mkfilesindices         none                       mkfilesindices             false   false
 mkchecksums            none                       mkchecksums                false   false
 mirror                 none                       mirror\ hardlinks          false   false

-ddaccess               none                       ddaccessible\ sync         false   false

 NOSTAGE                remove_locks               none                       false   false
 STATE                  postlock                   none                       false   false
 NOSTAGE                remove_locks               none                       false   false
 STATE                  postlock                   none                       false   false

+ddaccess               none                       ddaccessible\ sync         true    true

 changelogs             none                       changelogs                 false   true
 pg_timestamp           postdinstall               pg_dump2                   false   false
 expire                 none                       expire_dumps               false   true
 changelogs             none                       changelogs                 false   true
 pg_timestamp           postdinstall               pg_dump2                   false   false
 expire                 none                       expire_dumps               false   true


@@ -279,15 +279,19 @@ log "Daily cron scripts successful, all done"
 
 exec > "$logdir/afterdinstall.log" 2>&1
 
 
 exec > "$logdir/afterdinstall.log" 2>&1
 

-GO=(
-    FUNC="renamelogfile"
-    TIME=""
-    ARGS=""
-    ERR="false"
-)
-stage $GO
-state "all done"
+if [ -f "${dbdir}/dinstallstart" ]; then
+    NOW=$(cat "${dbdir}/dinstallstart")
+    mv "$LOGFILE" "$logdir/dinstall_${NOW}.log"
+    logstats "$logdir/dinstall_${NOW}.log"
+    bzip2 -9 "$logdir/dinstall_${NOW}.log"
+else
+    error "Problem, I don't know when dinstall started, unable to do log statistics."
+    NOW=`date "+%Y.%m.%d-%H:%M:%S"`
+    mv "$LOGFILE" "$logdir/dinstall_${NOW}.log"
+    bzip2 -9 "$logdir/dinstall_${NOW}.log"
+fi

 
 

+state "all done"

 
 # Now, at the very (successful) end of dinstall, make sure we remove
 # our stage files, so the next dinstall run will do it all again.
 
 # Now, at the very (successful) end of dinstall, make sure we remove
 # our stage files, so the next dinstall run will do it all again.