Selaa lähdekoodia

#11607 fixed formatting

Anton Sergeyev 7 vuotta sitten
vanhempi
commit
2024cf4b56
3 muutettua tiedostoa jossa 7 lisäystä ja 8 poistoa
  1. 1 1
      conf/sample.ini
  2. 5 6
      pkg/services/cleanup/cleanup_test.go
  3. 1 1
      pkg/setting/setting.go

+ 1 - 1
conf/sample.ini

@@ -15,7 +15,7 @@
 ;data = /var/lib/grafana
 
 # Temporary files in `data` directory older than given duration will be removed
-temp_data_lifetime = 24h
+;temp_data_lifetime = 24h
 
 # Directory where grafana can store logs
 ;logs = /var/log/grafana

+ 5 - 6
pkg/services/cleanup/cleanup_test.go

@@ -1,10 +1,9 @@
 package cleanup
 
 import (
-	"testing"
-
 	"github.com/grafana/grafana/pkg/setting"
 	. "github.com/smartystreets/goconvey/convey"
+	"testing"
 	"time"
 )
 
@@ -21,21 +20,21 @@ func TestCleanUpTmpFiles(t *testing.T) {
 		weekAgo := now.Add(-time.Second * 3600 * 24 * 7)
 
 		Convey("Should not cleanup recent files", func() {
-			So(service.shouldCleanupTempFile(secondAgo, now), ShouldBeFalse);
+			So(service.shouldCleanupTempFile(secondAgo, now), ShouldBeFalse)
 		})
 
 		Convey("Should cleanup older files", func() {
-			So(service.shouldCleanupTempFile(dayAgo, now), ShouldBeTrue);
+			So(service.shouldCleanupTempFile(dayAgo, now), ShouldBeTrue)
 		})
 
 		Convey("After increasing temporary files lifetime, older files should be kept", func() {
 			cfg.TempDataLifetime, _ = time.ParseDuration("1000h")
-			So(service.shouldCleanupTempFile(weekAgo, now), ShouldBeFalse);
+			So(service.shouldCleanupTempFile(weekAgo, now), ShouldBeFalse)
 		})
 
 		Convey("If lifetime is 0, files should never be cleaned up", func() {
 			cfg.TempDataLifetime = 0
-			So(service.shouldCleanupTempFile(weekAgo, now), ShouldBeFalse);
+			So(service.shouldCleanupTempFile(weekAgo, now), ShouldBeFalse)
 		})
 	})
 

+ 1 - 1
pkg/setting/setting.go

@@ -641,7 +641,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
 	cfg.ImagesDir = filepath.Join(DataPath, "png")
 	cfg.PhantomDir = filepath.Join(HomePath, "tools/phantomjs")
 	cfg.TempDataLifetime = iniFile.Section("paths").Key("temp_data_lifetime").MustDuration(
-		time.Duration(time.Second*3600*24),
+		time.Duration(time.Second * 3600 * 24),
 	)
 
 	analytics := iniFile.Section("analytics")