Set session and indexers' data files rel to AppDataPath #2192

dubeg · 2017-07-21T17:42:31Z

The setting AppDataPath now defaults to being 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.

This change targets #2159.

cez81 · 2017-07-21T21:01:00Z

Also fixes #1378

lafriks · 2017-07-21T20:48:58Z

modules/setting/setting.go

@@ -1243,7 +1243,7 @@ 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, "data/sessions")), "\" ")


lafriks · 2017-07-21T21:07:25Z

models/models.go

@@ -147,7 +147,7 @@ func LoadConfigs() {
 	DbCfg.Timeout = sec.Key("SQLITE_TIMEOUT").MustInt(500)

 	sec = setting.Cfg.Section("indexer")
-	setting.Indexer.IssuePath = 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"))


It needs to be checked if path is absolute (see https://github.com/go-gitea/gitea/blob/master/modules/setting/setting.go#L842)

dubeg · 2017-07-24T21:47:05Z

I am not used to the pull request process. I amended my current commit to include the feedback. Is this the correct method?

I added a new setting variable containing the working directory named AppWorkPath. Maybe I should've named it AppWorkDir?

lafriks · 2017-07-24T22:12:23Z

Now it is called differently in multiple places so either dir or path but do not mix (i would vote for path). You can add commits to your branch and they will show up here

dubeg · 2017-07-25T14:47:02Z

Ok I changed to workPath the fn & vars that were named workDir. Anything else?

dubeg · 2017-07-31T14:01:33Z

I just added a minor change to the path ProviderConfig. I forgot to remove the "data" in "data/sessions" when joining with AppDataPath.

By the way, I noticed we use path.Join as well as filepath.Join almost as often. I checked their definition and they're a bit different. What's the logic here? Should we use one or the other, or does it not matter?

lafriks · 2017-08-17T16:41:55Z

@dubeg Please fix formatting issues (see drone build that is failing). path.Join should be used for URL's, filepath.Join for file path :)

lunny · 2017-10-31T06:07:40Z

@dubeg need rebase

lunny · 2017-10-31T09:24:24Z

modules/setting/setting.go

@@ -1188,7 +1187,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")


Why change filepath to path?

lunny · 2017-10-31T09:24:41Z

need rebase.

dubeg · 2017-10-31T19:27:25Z

Sorry I've been terribly busy and also lazy since August. I'll try to fix the PR this week. As for filepath to path, I didn't know the purpose of each of them until Lafriks commented on them. I'll review what I did on that matter.

lunny · 2017-11-01T00:42:28Z

@dubeg Or could you give the permission to let maintainers to help you to push to this PR.

dubeg · 2017-11-01T13:13:21Z

@lunny How can I do that?
Is it related to this checkbox?

lunny · 2017-11-01T13:25:36Z

@dubeg yes

dubeg · 2017-11-01T16:24:56Z

@lunny Well it's been checked for a while. If you want to finish to modify the PR, go ahead. Otherwise I'll work on it this weekend.

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.

codecov-io · 2017-11-03T03:15:27Z

Codecov Report

Merging #2192 into master will increase coverage by <.01%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master    #2192      +/-   ##
==========================================
+ Coverage   26.84%   26.85%   +<.01%     
==========================================
  Files          89       89              
  Lines       17609    17607       -2     
==========================================
  Hits         4728     4728              
+ Misses      12195    12193       -2     
  Partials      686      686

Impacted Files	Coverage Δ
models/models.go	`28.31% <0%> (+0.24%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 95637e0...fe26551. Read the comment docs.

lunny · 2017-11-03T03:33:08Z

@dubeg rebased and LGTM

lafriks · 2017-11-03T08:56:09Z

LGTM

lafriks requested changes Jul 21, 2017

View reviewed changes

lafriks added type/enhancement An improvement of existing functionality lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 21, 2017

dubeg force-pushed the master branch 2 times, most recently from 9b9890a to ca3ff45 Compare July 24, 2017 21:36

lunny added this to the 1.3.0 milestone Jul 25, 2017

dubeg force-pushed the master branch from ca3ff45 to 922c163 Compare July 25, 2017 14:34

lafriks approved these changes Jul 26, 2017

View reviewed changes

lafriks mentioned this pull request Jul 30, 2017

Static configuration for root directory #2229

Closed

dubeg force-pushed the master branch from 922c163 to 7090832 Compare July 31, 2017 13:47

dubeg force-pushed the master branch 4 times, most recently from 21714a3 to 5c0f65f Compare August 8, 2017 22:01

lafriks mentioned this pull request Aug 28, 2017

Fix config paths which do not respect GITEA_WORK_DIR #2397

Closed

cez81 mentioned this pull request Oct 19, 2017

CreateIssuesIndexer: mkdir indexers: permission denied #1378

Closed

5 tasks

cez81 mentioned this pull request Oct 31, 2017

Working folder for windows service #2795

Closed

7 tasks

lunny reviewed Oct 31, 2017

View reviewed changes

gdube and others added 2 commits November 3, 2017 09:09

Set session and indexers' data files rel to AppDataPath

1184828

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

60a8fd6

lunny force-pushed the master branch from 5c0f65f to 60a8fd6 Compare November 3, 2017 03:02

tboerger added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Nov 3, 2017

Merge branch 'master' into master

fe26551

tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Nov 3, 2017

lafriks merged commit 8798cf4 into go-gitea:master Nov 3, 2017

This was referenced Nov 3, 2017

As a windows service, Gitea will write in System32 for its session files #2159

Closed

Change behavior for GITEA_WORK_DIR #1419

Closed

mqus mentioned this pull request Apr 18, 2018

database path is not relative to APP_DATA_PATH #3816

Closed

7 tasks

go-gitea locked and limited conversation to collaborators Nov 23, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Set session and indexers' data files rel to AppDataPath #2192

Set session and indexers' data files rel to AppDataPath #2192

dubeg commented Jul 21, 2017 •

edited

Loading

cez81 commented Jul 21, 2017

lafriks Jul 21, 2017

lafriks Jul 21, 2017

dubeg commented Jul 24, 2017

lafriks commented Jul 24, 2017

dubeg commented Jul 25, 2017 •

edited

Loading

dubeg commented Jul 31, 2017 •

edited

Loading

lafriks commented Aug 17, 2017

lunny commented Oct 31, 2017

lunny Oct 31, 2017

lunny commented Oct 31, 2017

dubeg commented Oct 31, 2017

lunny commented Nov 1, 2017

dubeg commented Nov 1, 2017

lunny commented Nov 1, 2017

dubeg commented Nov 1, 2017 •

edited

Loading

codecov-io commented Nov 3, 2017 •

edited

Loading

lunny commented Nov 3, 2017

lafriks commented Nov 3, 2017

Set session and indexers' data files rel to AppDataPath #2192

Set session and indexers' data files rel to AppDataPath #2192

Conversation

dubeg commented Jul 21, 2017 • edited Loading

cez81 commented Jul 21, 2017

lafriks Jul 21, 2017

Choose a reason for hiding this comment

lafriks Jul 21, 2017

Choose a reason for hiding this comment

dubeg commented Jul 24, 2017

lafriks commented Jul 24, 2017

dubeg commented Jul 25, 2017 • edited Loading

dubeg commented Jul 31, 2017 • edited Loading

lafriks commented Aug 17, 2017

lunny commented Oct 31, 2017

lunny Oct 31, 2017

Choose a reason for hiding this comment

lunny commented Oct 31, 2017

dubeg commented Oct 31, 2017

lunny commented Nov 1, 2017

dubeg commented Nov 1, 2017

lunny commented Nov 1, 2017

dubeg commented Nov 1, 2017 • edited Loading

codecov-io commented Nov 3, 2017 • edited Loading

Codecov Report

lunny commented Nov 3, 2017

lafriks commented Nov 3, 2017

dubeg commented Jul 21, 2017 •

edited

Loading

dubeg commented Jul 25, 2017 •

edited

Loading

dubeg commented Jul 31, 2017 •

edited

Loading

dubeg commented Nov 1, 2017 •

edited

Loading

codecov-io commented Nov 3, 2017 •

edited

Loading