From 8798cf4e3ba30bc0bdea073bf273ac27b71b78ce Mon Sep 17 00:00:00 2001 From: Guillaume Dube Date: Fri, 3 Nov 2017 04:56:20 -0400 Subject: [PATCH] Set session and indexers' data files rel to AppDataPath (#2192) * Set session and indexers' data files rel to AppDataPath The setting AppDataPath is now relative to the working directory. The session svc's PROVIDER_CONFIG now defaults to AppDataPath/data/sessions. The issue indexer's IssuePath now defaults to AppDataPath/indexers/issues.bleves. * fix bug --- cmd/dump.go | 5 +- cmd/serv.go | 6 +- models/models.go | 23 +++----- modules/setting/setting.go | 111 +++++++++++++++++++------------------ routers/init.go | 2 + 5 files changed, 73 insertions(+), 74 deletions(-) diff --git a/cmd/dump.go b/cmd/dump.go index 2f42bb8d6d..588a2175de 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -126,10 +126,7 @@ func runDump(ctx *cli.Context) error { 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) + sessionAbsPath = setting.SessionConfig.ProviderConfig } if err := zipAddDirectoryExclude(z, "data", setting.AppDataPath, sessionAbsPath); err != nil { log.Fatalf("Failed to include data directory: %v", err) diff --git a/cmd/serv.go b/cmd/serv.go index 4e3b9de2f9..5dc3785852 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -50,9 +50,9 @@ func setup(logPath string) error { models.LoadConfigs() if setting.UseSQLite3 || setting.UseTiDB { - workDir, _ := setting.WorkDir() - if err := os.Chdir(workDir); err != nil { - log.GitLogger.Fatal(4, "Failed to change directory %s: %v", workDir, err) + workPath := setting.AppWorkPath + if err := os.Chdir(workPath); err != nil { + log.GitLogger.Fatal(4, "Failed to change directory %s: %v", workPath, err) } } diff --git a/models/models.go b/models/models.go index 853b9799ed..836a14db5a 100644 --- a/models/models.go +++ b/models/models.go @@ -11,11 +11,11 @@ import ( "net/url" "os" "path" + "path/filepath" "strings" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" // Needed for the MySQL driver _ "github.com/go-sql-driver/mysql" @@ -152,11 +152,15 @@ func LoadConfigs() { DbCfg.Timeout = sec.Key("SQLITE_TIMEOUT").MustInt(500) sec = setting.Cfg.Section("indexer") - setting.Indexer.IssuePath = absolutePath( - sec.Key("ISSUE_INDEXER_PATH").MustString("indexers/issues.bleve")) + setting.Indexer.IssuePath = sec.Key("ISSUE_INDEXER_PATH").MustString(path.Join(setting.AppDataPath, "indexers/issues.bleve")) + if !filepath.IsAbs(setting.Indexer.IssuePath) { + setting.Indexer.IssuePath = path.Join(setting.AppWorkPath, setting.Indexer.IssuePath) + } setting.Indexer.RepoIndexerEnabled = sec.Key("REPO_INDEXER_ENABLED").MustBool(false) - setting.Indexer.RepoPath = absolutePath( - sec.Key("REPO_INDEXER_PATH").MustString("indexers/repos.bleve")) + setting.Indexer.RepoPath = sec.Key("REPO_INDEXER_PATH").MustString(path.Join(setting.AppDataPath, "indexers/repos.bleve")) + if !filepath.IsAbs(setting.Indexer.RepoPath) { + setting.Indexer.RepoPath = path.Join(setting.AppWorkPath, setting.Indexer.RepoPath) + } setting.Indexer.UpdateQueueLength = sec.Key("UPDATE_BUFFER_LEN").MustInt(20) setting.Indexer.MaxIndexerFileSize = sec.Key("MAX_FILE_SIZE").MustInt64(512 * 1024 * 1024) } @@ -343,12 +347,3 @@ func DumpDatabase(filePath string, dbType string) error { } return x.DumpTablesToFile(tbs, filePath) } - -// absolutePath make path absolute if it is relative -func absolutePath(path string) string { - workDir, err := setting.WorkDir() - if err != nil { - log.Fatal(4, "Failed to get work directory: %v", err) - } - return util.EnsureAbsolutePath(path, workDir) -} diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 3b9aff44e2..d22bb24f94 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -71,6 +71,7 @@ var ( AppSubURLDepth int // Number of slashes AppPath string AppDataPath string + AppWorkPath string // Server settings Protocol Scheme @@ -525,17 +526,46 @@ func DateLang(lang string) string { return "en" } -// execPath returns the executable path. -func execPath() (string, error) { - execFile := os.Args[0] - if IsWindows && filepath.IsAbs(execFile) { - return filepath.Clean(execFile), nil +func getAppPath() (string, error) { + var appPath string + var err error + if IsWindows && filepath.IsAbs(os.Args[0]) { + appPath = filepath.Clean(os.Args[0]) + } else { + appPath, err = exec.LookPath(os.Args[0]) } - file, err := exec.LookPath(execFile) + if err != nil { return "", err } - return filepath.Abs(file) + appPath, err = filepath.Abs(appPath) + if err != nil { + return "", err + } + // Note: we don't use path.Dir here because it does not handle case + // which path starts with two "/" in Windows: "//psf/Home/..." + return strings.Replace(appPath, "\\", "/", -1), err +} + +func getWorkPath(appPath string) string { + workPath := "" + giteaWorkPath := os.Getenv("GITEA_WORK_DIR") + gogsWorkPath := os.Getenv("GOGS_WORK_DIR") + + if len(giteaWorkPath) > 0 { + workPath = giteaWorkPath + } else if len(gogsWorkPath) > 0 { + log.Warn(`Usage of GOGS_WORK_DIR is deprecated and will be *removed* in a future release, please consider changing to GITEA_WORK_DIR`) + workPath = gogsWorkPath + } else { + i := strings.LastIndex(appPath, "/") + if i == -1 { + workPath = appPath + } else { + workPath = appPath[:i] + } + } + return strings.Replace(workPath, "\\", "/", -1) } func init() { @@ -543,35 +573,10 @@ func init() { log.NewLogger(0, "console", `{"level": 0}`) var err error - if AppPath, err = execPath(); err != nil { + if AppPath, err = getAppPath(); err != nil { log.Fatal(4, "Failed to get app path: %v", err) } - - // Note: we don't use path.Dir here because it does not handle case - // which path starts with two "/" in Windows: "//psf/Home/..." - AppPath = strings.Replace(AppPath, "\\", "/", -1) -} - -// WorkDir returns absolute path of work directory. -func WorkDir() (string, error) { - wd := os.Getenv("GITEA_WORK_DIR") - if len(wd) > 0 { - return wd, nil - } - // Use GOGS_WORK_DIR if available, for backward compatibility - // TODO: drop in 1.1.0 ? - wd = os.Getenv("GOGS_WORK_DIR") - if len(wd) > 0 { - log.Warn(`Usage of GOGS_WORK_DIR is deprecated and will be *removed* in a future release, -please consider changing to GITEA_WORK_DIR`) - return wd, nil - } - - i := strings.LastIndex(AppPath, "/") - if i == -1 { - return AppPath, nil - } - return AppPath[:i], nil + AppWorkPath = getWorkPath(AppPath) } func forcePathSeparator(path string) { @@ -612,16 +617,13 @@ func createPIDFile(pidPath string) { // NewContext initializes configuration context. // NOTE: do not print any log except error. func NewContext() { - workDir, err := WorkDir() - if err != nil { - log.Fatal(4, "Failed to get work directory: %v", err) - } - Cfg = ini.Empty() CustomPath = os.Getenv("GITEA_CUSTOM") if len(CustomPath) == 0 { - CustomPath = workDir + "/custom" + CustomPath = path.Join(AppWorkPath, "custom") + } else if !filepath.IsAbs(CustomPath) { + CustomPath = path.Join(AppWorkPath, CustomPath) } if len(CustomPID) > 0 { @@ -629,13 +631,13 @@ func NewContext() { } if len(CustomConf) == 0 { - CustomConf = CustomPath + "/conf/app.ini" + CustomConf = path.Join(CustomPath, "conf/app.ini") } else if !filepath.IsAbs(CustomConf) { - CustomConf = filepath.Join(workDir, CustomConf) + CustomConf = path.Join(CustomPath, CustomConf) } if com.IsFile(CustomConf) { - if err = Cfg.Append(CustomConf); err != nil { + if err := Cfg.Append(CustomConf); err != nil { log.Fatal(4, "Failed to load custom conf '%s': %v", CustomConf, err) } } else { @@ -649,7 +651,7 @@ func NewContext() { } homeDir = strings.Replace(homeDir, "\\", "/", -1) - LogRootPath = Cfg.Section("log").Key("ROOT_PATH").MustString(path.Join(workDir, "log")) + LogRootPath = Cfg.Section("log").Key("ROOT_PATH").MustString(path.Join(AppWorkPath, "log")) forcePathSeparator(LogRootPath) sec := Cfg.Section("server") @@ -716,8 +718,8 @@ func NewContext() { LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(defaultLocalURL) OfflineMode = sec.Key("OFFLINE_MODE").MustBool() DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() - StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir) - AppDataPath = sec.Key("APP_DATA_PATH").MustString("data") + StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(AppWorkPath) + AppDataPath = sec.Key("APP_DATA_PATH").MustString(path.Join(AppWorkPath, "data")) EnableGzip = sec.Key("ENABLE_GZIP").MustBool() EnablePprof = sec.Key("ENABLE_PPROF").MustBool(false) @@ -783,7 +785,7 @@ func NewContext() { } LFS.ContentPath = sec.Key("LFS_CONTENT_PATH").MustString(filepath.Join(AppDataPath, "lfs")) if !filepath.IsAbs(LFS.ContentPath) { - LFS.ContentPath = filepath.Join(workDir, LFS.ContentPath) + LFS.ContentPath = filepath.Join(AppWorkPath, LFS.ContentPath) } if LFS.StartServer { @@ -915,7 +917,7 @@ func NewContext() { sec = Cfg.Section("attachment") AttachmentPath = sec.Key("PATH").MustString(path.Join(AppDataPath, "attachments")) if !filepath.IsAbs(AttachmentPath) { - AttachmentPath = path.Join(workDir, AttachmentPath) + AttachmentPath = path.Join(AppWorkPath, AttachmentPath) } AttachmentAllowedTypes = strings.Replace(sec.Key("ALLOWED_TYPES").MustString("image/jpeg,image/png,application/zip,application/gzip"), "|", ",", -1) AttachmentMaxSize = sec.Key("MAX_SIZE").MustInt64(4) @@ -969,7 +971,7 @@ func NewContext() { RepoRootPath = sec.Key("ROOT").MustString(path.Join(homeDir, "gitea-repositories")) forcePathSeparator(RepoRootPath) if !filepath.IsAbs(RepoRootPath) { - RepoRootPath = path.Join(workDir, RepoRootPath) + RepoRootPath = path.Join(AppWorkPath, RepoRootPath) } else { RepoRootPath = path.Clean(RepoRootPath) } @@ -985,14 +987,14 @@ func NewContext() { } if !filepath.IsAbs(Repository.Upload.TempPath) { - Repository.Upload.TempPath = path.Join(workDir, Repository.Upload.TempPath) + Repository.Upload.TempPath = path.Join(AppWorkPath, Repository.Upload.TempPath) } sec = Cfg.Section("picture") AvatarUploadPath = sec.Key("AVATAR_UPLOAD_PATH").MustString(path.Join(AppDataPath, "avatars")) forcePathSeparator(AvatarUploadPath) if !filepath.IsAbs(AvatarUploadPath) { - AvatarUploadPath = path.Join(workDir, AvatarUploadPath) + AvatarUploadPath = path.Join(AppWorkPath, AvatarUploadPath) } switch source := sec.Key("GRAVATAR_SOURCE").MustString("gravatar"); source { case "duoshuo": @@ -1254,7 +1256,7 @@ func NewXORMLogService(disableConsole bool) { if err = os.MkdirAll(path.Dir(logPath), os.ModePerm); err != nil { panic(err.Error()) } - logPath = filepath.Join(filepath.Dir(logPath), "xorm.log") + logPath = path.Join(filepath.Dir(logPath), "xorm.log") logConfigs = fmt.Sprintf( `{"level":%s,"filename":"%s","rotate":%v,"maxlines":%d,"maxsize":%d,"daily":%v,"maxdays":%d}`, level, @@ -1341,7 +1343,10 @@ func newCacheService() { func newSessionService() { SessionConfig.Provider = Cfg.Section("session").Key("PROVIDER").In("memory", []string{"memory", "file", "redis", "mysql"}) - SessionConfig.ProviderConfig = strings.Trim(Cfg.Section("session").Key("PROVIDER_CONFIG").String(), "\" ") + SessionConfig.ProviderConfig = strings.Trim(Cfg.Section("session").Key("PROVIDER_CONFIG").MustString(path.Join(AppDataPath, "sessions")), "\" ") + if !filepath.IsAbs(SessionConfig.ProviderConfig) { + SessionConfig.ProviderConfig = path.Join(AppWorkPath, SessionConfig.ProviderConfig) + } SessionConfig.CookieName = Cfg.Section("session").Key("COOKIE_NAME").MustString("i_like_gitea") SessionConfig.CookiePath = AppSubURL SessionConfig.Secure = Cfg.Section("session").Key("COOKIE_SECURE").MustBool(false) diff --git a/routers/init.go b/routers/init.go index 18a6d03d08..3ed5fc4f58 100644 --- a/routers/init.go +++ b/routers/init.go @@ -45,6 +45,8 @@ func NewServices() { // GlobalInit is for global configuration reload-able. func GlobalInit() { setting.NewContext() + log.Trace("AppPath: %s", setting.AppPath) + log.Trace("AppWorkPath: %s", setting.AppWorkPath) log.Trace("Custom path: %s", setting.CustomPath) log.Trace("Log path: %s", setting.LogRootPath) models.LoadConfigs()