Browse Source

Move LFS directory creation out of NewContext (#11362)

Fix #9481
(probably others too)

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: Lauris BH <lauris@nix.lv>
tags/v1.13.0-dev
zeripath 4 years ago
parent
commit
f8e015e8e4
No account linked to committer's email address
1 changed files with 9 additions and 4 deletions
  1. 9
    4
      modules/setting/setting.go

+ 9
- 4
modules/setting/setting.go View File

@@ -749,10 +749,6 @@ func NewContext() {
LFS.HTTPAuthExpiry = sec.Key("LFS_HTTP_AUTH_EXPIRY").MustDuration(20 * time.Minute)

if LFS.StartServer {
if err := os.MkdirAll(LFS.ContentPath, 0700); err != nil {
log.Fatal("Failed to create '%s': %v", LFS.ContentPath, err)
}

LFS.JWTSecretBytes = make([]byte, 32)
n, err := base64.RawURLEncoding.Decode(LFS.JWTSecretBytes, []byte(LFS.JWTSecretBase64))

@@ -1111,11 +1107,20 @@ func loadOrGenerateInternalToken(sec *ini.Section) string {
return token
}

func ensureLFSDirectory() {
if LFS.StartServer {
if err := os.MkdirAll(LFS.ContentPath, 0700); err != nil {
log.Fatal("Failed to create '%s': %v", LFS.ContentPath, err)
}
}
}

// NewServices initializes the services
func NewServices() {
InitDBConfig()
newService()
NewLogServices(false)
ensureLFSDirectory()
newCacheService()
newSessionService()
newCORSService()

Loading…
Cancel
Save