diff options
| author | Paolo Borelli <pborelli@gnome.org> | 2015-07-31 08:50:11 +0200 |
|---|---|---|
| committer | Paolo Borelli <pborelli@gnome.org> | 2015-08-15 10:05:12 +0200 |
| commit | 0d38794c7f9b25b2e602cb0d2f686e74cd1ab1cb (patch) | |
| tree | 5ebac231c18bbce2ee1ba5f8e244b26cf198b46d /modules/setting/setting.go | |
| parent | b35d7eee31e8a33e314d54514854efaeee9d46b1 (diff) | |
| download | gitea-0d38794c7f9b25b2e602cb0d2f686e74cd1ab1cb.tar.gz gitea-0d38794c7f9b25b2e602cb0d2f686e74cd1ab1cb.zip | |
Factor out function to get the current user
The same logic was duplicated in three places. Factor it
out so that we can add further fallbacks in a single place.
Diffstat (limited to 'modules/setting/setting.go')
| -rw-r--r-- | modules/setting/setting.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index acd3aae689..79e47c8901 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -24,6 +24,7 @@ import ( "github.com/gogits/gogs/modules/bindata" "github.com/gogits/gogs/modules/log" // "github.com/gogits/gogs/modules/ssh" + "github.com/gogits/gogs/modules/user" ) type Scheme string @@ -309,10 +310,7 @@ func NewConfigContext() { }[Cfg.Section("time").Key("FORMAT").MustString("RFC1123")] RunUser = Cfg.Section("").Key("RUN_USER").String() - curUser := os.Getenv("USER") - if len(curUser) == 0 { - curUser = os.Getenv("USERNAME") - } + curUser := user.CurrentUsername() // Does not check run user when the install lock is off. if InstallLock && RunUser != curUser { log.Fatal(4, "Expect user(%s) but current user is: %s", RunUser, curUser) |