taldir

commit a658298cba37039a40f6d109a1351c2009bfe27e
parent 877761d2ef55888e062e08036a3b4ffd9460de92
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Tue, 12 Jul 2022 15:05:54 +0200

make validation cleanup expiration configurable

Diffstat:
M
cmd/taldir-server/testdata/taldir-test.conf
 | 
1
+
M
config/taldir-example.conf
 | 
1
+
M
pkg/rest/taldir.go
 | 
9
++++++++-

3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/cmd/taldir-server/testdata/taldir-test.conf b/cmd/taldir-server/testdata/taldir-test.conf
@@ -17,6 +17,7 @@ validation_timeframe = 10m
 solution_attempt_timeframe = 1h
 merchant_baseurl_private = http://merchant.taldir/instances/myInstance
 merchant_token = superSecretToken
+validation_expiration = 24h
 
 [taldir-test]
 challenge_fee = KUDOS:0
diff --git a/config/taldir-example.conf b/config/taldir-example.conf
@@ -17,6 +17,7 @@ solution_attempt_timeframe = 1h
 merchant_baseurl_private = http://merchant.taldir/instances/myInstance
 merchant_token = superSecretToken
 validation_landing = testdata/templates/validation_landing.html
+validation_expiration = 24h
 
 [taldir-email]
 sender = "taldir@taler.net"
diff --git a/pkg/rest/taldir.go b/pkg/rest/taldir.go
@@ -827,7 +827,14 @@ func (t *Taldir) Initialize(cfgfile string) {
 
 
   // Clean up validations
-  tx := t.Db.Where("created_at < ?", time.Now().AddDate(0, 0, -1)).Delete(&Validation{})
+  validationExpStr := t.Cfg.Section("taldir").Key("validation_expiration").MustString("24h")
+  validationExp, err := time.ParseDuration(validationExpStr)
+  if err != nil {
+    log.Fatal(err)
+  }
+
+  tx := t.Db.Where("created_at < ?", time.Now().Add(-validationExp)).Delete(&Validation{})
+  //tx := t.Db.Where("created_at < ?", time.Now().AddDate(0, 0, -1)).Delete(&Validation{})
   log.Printf("Cleaned up %d stale validations.\n", tx.RowsAffected)
   validationLandingTplFile := t.Cfg.Section("taldir").Key("validation_landing").MustString("templates/validation_landing.html")
   t.ValidationTpl, err = template.ParseFiles(validationLandingTplFile)