aboutsummaryrefslogtreecommitdiffstats
path: root/modules/setting
diff options
context:
space:
mode:
Diffstat (limited to 'modules/setting')
-rw-r--r--modules/setting/lfs.go8
-rw-r--r--modules/setting/setting.go24
2 files changed, 26 insertions, 6 deletions
diff --git a/modules/setting/lfs.go b/modules/setting/lfs.go
index 5af80c2ab1..ab475bbeb4 100644
--- a/modules/setting/lfs.go
+++ b/modules/setting/lfs.go
@@ -13,8 +13,8 @@ import (
"code.gitea.io/gitea/modules/generate"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
+ "code.gitea.io/gitea/modules/util"
- "github.com/unknwon/com"
ini "gopkg.in/ini.v1"
)
@@ -65,7 +65,11 @@ func newLFSService() {
// Save secret
cfg := ini.Empty()
- if com.IsFile(CustomConf) {
+ isFile, err := util.IsFile(CustomConf)
+ if err != nil {
+ log.Error("Unable to check if %s is a file. Error: %v", CustomConf, err)
+ }
+ if isFile {
// Keeps custom settings if there is already something.
if err := cfg.Append(CustomConf); err != nil {
log.Error("Failed to load custom conf '%s': %v", CustomConf, err)
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 708dc28233..79e7751905 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -25,6 +25,7 @@ import (
"code.gitea.io/gitea/modules/generate"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/user"
+ "code.gitea.io/gitea/modules/util"
shellquote "github.com/kballard/go-shellquote"
"github.com/unknwon/com"
@@ -498,7 +499,11 @@ func NewContext() {
createPIDFile(PIDFile)
}
- if com.IsFile(CustomConf) {
+ isFile, err := util.IsFile(CustomConf)
+ if err != nil {
+ log.Error("Unable to check if %s is a file. Error: %v", CustomConf, err)
+ }
+ if isFile {
if err := Cfg.Append(CustomConf); err != nil {
log.Fatal("Failed to load custom conf '%s': %v", CustomConf, err)
}
@@ -739,7 +744,11 @@ func NewContext() {
return
}
cfg := ini.Empty()
- if com.IsFile(CustomConf) {
+ isFile, err := util.IsFile(CustomConf)
+ if err != nil {
+ log.Error("Unable to check if %s is a file. Error: %v", CustomConf, err)
+ }
+ if isFile {
if err := cfg.Append(CustomConf); err != nil {
log.Error("failed to load custom conf %s: %v", CustomConf, err)
return
@@ -908,7 +917,10 @@ func NewContext() {
UI.SearchRepoDescription = Cfg.Section("ui").Key("SEARCH_REPO_DESCRIPTION").MustBool(true)
UI.UseServiceWorker = Cfg.Section("ui").Key("USE_SERVICE_WORKER").MustBool(true)
- HasRobotsTxt = com.IsFile(path.Join(CustomPath, "robots.txt"))
+ HasRobotsTxt, err = util.IsFile(path.Join(CustomPath, "robots.txt"))
+ if err != nil {
+ log.Error("Unable to check if %s is a file. Error: %v", path.Join(CustomPath, "robots.txt"), err)
+ }
newMarkup()
@@ -1005,7 +1017,11 @@ func loadOrGenerateInternalToken(sec *ini.Section) string {
// Save secret
cfgSave := ini.Empty()
- if com.IsFile(CustomConf) {
+ isFile, err := util.IsFile(CustomConf)
+ if err != nil {
+ log.Error("Unable to check if %s is a file. Error: %v", CustomConf, err)
+ }
+ if isFile {
// Keeps custom settings if there is already something.
if err := cfgSave.Append(CustomConf); err != nil {
log.Error("Failed to load custom conf '%s': %v", CustomConf, err)