Specify unit in duration

cs3org · Feb 24, 2021 · efc9f78 · efc9f78
1 parent 8be838f
commit efc9f78
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/pkg/cbox/publicshare/sql/sql.go b/pkg/cbox/publicshare/sql/sql.go
@@ -75,7 +75,7 @@ func (c *config) init() {
 }
 
 func (m *manager) startJanitorRun() {
-	ticker := time.NewTicker(time.Duration(m.c.JanitorRunInterval))
+	ticker := time.NewTicker(time.Duration(m.c.JanitorRunInterval) * time.Second)
 	work := make(chan os.Signal, 1)
 	signal.Notify(work, syscall.SIGHUP, syscall.SIGINT, syscall.SIGQUIT)
 

diff --git a/pkg/publicshare/manager/json/json.go b/pkg/publicshare/manager/json/json.go
@@ -63,11 +63,12 @@ func New(c map[string]interface{}) (publicshare.Manager, error) {
 	conf.init()
 
 	m := manager{
-		mutex:            &sync.Mutex{},
-		marshaler:        jsonpb.Marshaler{},
-		unmarshaler:      jsonpb.Unmarshaler{},
-		file:             conf.File,
-		passwordHashCost: conf.SharePasswordHashCost,
+		mutex:              &sync.Mutex{},
+		marshaler:          jsonpb.Marshaler{},
+		unmarshaler:        jsonpb.Unmarshaler{},
+		file:               conf.File,
+		passwordHashCost:   conf.SharePasswordHashCost,
+		janitorRunInterval: conf.JanitorRunInterval,
 	}
 
 	// attempt to create the db file
@@ -124,7 +125,7 @@ type manager struct {
 }
 
 func (m *manager) startJanitorRun() {
-	ticker := time.NewTicker(time.Duration(m.janitorRunInterval))
+	ticker := time.NewTicker(time.Duration(m.janitorRunInterval) * time.Second)
 	work := make(chan os.Signal, 1)
 	signal.Notify(work, syscall.SIGHUP, syscall.SIGINT, syscall.SIGQUIT)