From 44d75b3a55e62705c4cb51e8d5af70de99db7d5c Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Tue, 11 Jun 2019 14:46:42 -0400 Subject: [PATCH] allow cleanup for shorter durations --- honk.go | 14 +++++++++++--- upgradedb.go | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/honk.go b/honk.go index d017e12..286df41 100644 --- a/honk.go +++ b/honk.go @@ -1366,7 +1366,7 @@ func serve() { } } -func cleanupdb() { +func cleanupdb(days int) { db := opendatabase() rows, _ := db.Query("select userid, name from zonkers where wherefore = 'zonvoy'") deadthreads := make(map[int64][]string) @@ -1383,7 +1383,7 @@ func cleanupdb() { doordie(db, "delete from honks where userid = ? and convoy = ?", userid, t) } } - expdate := time.Now().UTC().Add(-30 * 24 * time.Hour).Format(dbtimeformat) + expdate := time.Now().UTC().Add(-time.Duration(days) * 24 * time.Hour).Format(dbtimeformat) doordie(db, "delete from donks where honkid in (select honkid from honks where dt < ? and whofore = 0 and convoy not in (select convoy from honks where whofore = 2 or whofore = 3))", expdate) doordie(db, "delete from honks where dt < ? and whofore = 0 and convoy not in (select convoy from honks where whofore = 2 or whofore = 3)", expdate) doordie(db, "delete from files where fileid not in (select fileid from donks)") @@ -1458,6 +1458,7 @@ func ElaborateUnitTests() { } func main() { + var err error cmd := "run" if len(os.Args) > 1 { cmd = os.Args[1] @@ -1480,7 +1481,14 @@ func main() { case "adduser": adduser() case "cleanup": - cleanupdb() + days := 30 + if len(os.Args) > 2 { + days, err = strconv.Atoi(os.Args[2]) + if err != nil { + log.Fatal(err) + } + } + cleanupdb(days) case "reduce": if len(os.Args) < 3 { log.Fatal("need a honker name") diff --git a/upgradedb.go b/upgradedb.go index 0ce1636..b238b59 100644 --- a/upgradedb.go +++ b/upgradedb.go @@ -101,6 +101,6 @@ func upgradedb() { default: log.Fatalf("can't upgrade unknown version %d", dbversion) } - cleanupdb() + cleanupdb(30) os.Exit(0) }