bug fix for dump when data directoryis not exist (#1025) (#1100)

cmd/dump.go

@@ -17,6 +17,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/setting"
 	"github.com/Unknwon/cae/zip"
+	"github.com/Unknwon/com"
 	"github.com/urfave/cli"
 )
 
@@ -100,17 +101,19 @@ func runDump(ctx *cli.Context) error {
 		log.Printf("Custom dir %s doesn't exist, skipped", setting.CustomPath)
 	}
 
-	log.Printf("Packing data directory...%s", setting.AppDataPath)
-	var sessionAbsPath string
-	if setting.SessionConfig.Provider == "file" {
-		if len(setting.SessionConfig.ProviderConfig) == 0 {
-			setting.SessionConfig.ProviderConfig = "data/sessions"
-		}
-		sessionAbsPath, _ = filepath.Abs(setting.SessionConfig.ProviderConfig)
-	}
+	if com.IsExist(setting.AppDataPath) {
+		log.Printf("Packing data directory...%s", setting.AppDataPath)
 
-	if err := zipAddDirectoryExclude(z, "data", setting.AppDataPath, sessionAbsPath); err != nil {
-		log.Fatalf("Fail to include data directory: %v", err)
+		var sessionAbsPath string
+		if setting.SessionConfig.Provider == "file" {
+			if len(setting.SessionConfig.ProviderConfig) == 0 {
+				setting.SessionConfig.ProviderConfig = "data/sessions"
+			}
+			sessionAbsPath, _ = filepath.Abs(setting.SessionConfig.ProviderConfig)
+		}
+		if err := zipAddDirectoryExclude(z, "data", setting.AppDataPath, sessionAbsPath); err != nil {
+			log.Fatalf("Failed to include data directory: %v", err)
+		}
 	}
 
 	if err := z.AddDir("log", setting.LogRootPath); err != nil {

modules/setting/setting.go

@@ -284,7 +284,9 @@ var (
 			RunAtStart bool
 			Schedule   string
 		}{
-			Schedule: "@every 10m",
+			Enabled:    true,
+			RunAtStart: false,
+			Schedule:   "@every 10m",
 		},
 		RepoHealthCheck: struct {
 			Enabled    bool
@@ -293,15 +295,18 @@ var (
 			Timeout    time.Duration
 			Args       []string `delim:" "`
 		}{
-			Schedule: "@every 24h",
-			Timeout:  60 * time.Second,
-			Args:     []string{},
+			Enabled:    true,
+			RunAtStart: false,
+			Schedule:   "@every 24h",
+			Timeout:    60 * time.Second,
+			Args:       []string{},
 		},
 		CheckRepoStats: struct {
 			Enabled    bool
 			RunAtStart bool
 			Schedule   string
 		}{
+			Enabled:    true,
 			RunAtStart: true,
 			Schedule:   "@every 24h",
 		},
@@ -767,11 +772,11 @@ func newLogService() {
 
 	useConsole := false
 	for _, mode := range LogModes {
-		if mode == "console"  {
+		if mode == "console" {
 			useConsole = true
 		}
 	}
-	if (!useConsole) {
+	if !useConsole {
 		log.DelLogger("console")
 	}