diff options
| author | zeripath <art27@cantab.net> | 2021-09-14 02:24:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-13 21:24:57 -0400 |
| commit | 04b233e9408296fa14eb7623b7dbe0d98c1865f1 (patch) | |
| tree | 16455ab171377dec72a732c4fb604acc2cc3d4ca | |
| parent | 8af7a21085b73379e5f268c7a52ea77c51bb9246 (diff) | |
| download | gitea-04b233e9408296fa14eb7623b7dbe0d98c1865f1.tar.gz gitea-04b233e9408296fa14eb7623b7dbe0d98c1865f1.zip | |
Always emit the configuration path (#17036)
Often when handling problems it is not clear which configuration file Gitea is
using. This PR simply ensures that the configuration file is emitted.
Signed-off-by: Andrew Thornton <art27@cantab.net>
| -rw-r--r-- | cmd/convert.go | 1 | ||||
| -rw-r--r-- | cmd/dump_repo.go | 1 | ||||
| -rw-r--r-- | cmd/migrate.go | 1 | ||||
| -rw-r--r-- | cmd/migrate_storage.go | 1 | ||||
| -rw-r--r-- | routers/init.go | 1 | ||||
| -rw-r--r-- | routers/install/setting.go | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/cmd/convert.go b/cmd/convert.go index e2ffd403ac..aa404d64fa 100644 --- a/cmd/convert.go +++ b/cmd/convert.go @@ -31,6 +31,7 @@ func runConvert(ctx *cli.Context) error { log.Info("AppWorkPath: %s", setting.AppWorkPath) log.Info("Custom path: %s", setting.CustomPath) log.Info("Log path: %s", setting.LogRootPath) + log.Info("Configuration file: %s", setting.CustomConf) setting.InitDBConfig() if !setting.Database.UseMySQL { diff --git a/cmd/dump_repo.go b/cmd/dump_repo.go index 69813e3c87..3ea82f6d1a 100644 --- a/cmd/dump_repo.go +++ b/cmd/dump_repo.go @@ -84,6 +84,7 @@ func runDumpRepository(ctx *cli.Context) error { log.Info("AppWorkPath: %s", setting.AppWorkPath) log.Info("Custom path: %s", setting.CustomPath) log.Info("Log path: %s", setting.LogRootPath) + log.Info("Configuration file: %s", setting.CustomConf) setting.InitDBConfig() var ( diff --git a/cmd/migrate.go b/cmd/migrate.go index 23bc97b0c4..afed07f538 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -32,6 +32,7 @@ func runMigrate(ctx *cli.Context) error { log.Info("AppWorkPath: %s", setting.AppWorkPath) log.Info("Custom path: %s", setting.CustomPath) log.Info("Log path: %s", setting.LogRootPath) + log.Info("Configuration file: %s", setting.CustomConf) setting.InitDBConfig() if err := models.NewEngine(context.Background(), migrations.Migrate); err != nil { diff --git a/cmd/migrate_storage.go b/cmd/migrate_storage.go index 8123716f9b..08524953b4 100644 --- a/cmd/migrate_storage.go +++ b/cmd/migrate_storage.go @@ -114,6 +114,7 @@ func runMigrateStorage(ctx *cli.Context) error { log.Info("AppWorkPath: %s", setting.AppWorkPath) log.Info("Custom path: %s", setting.CustomPath) log.Info("Log path: %s", setting.LogRootPath) + log.Info("Configuration file: %s", setting.CustomConf) setting.InitDBConfig() if err := models.NewEngine(context.Background(), migrations.Migrate); err != nil { diff --git a/routers/init.go b/routers/init.go index fe89c738ef..52eacfd02b 100644 --- a/routers/init.go +++ b/routers/init.go @@ -81,6 +81,7 @@ func GlobalInit(ctx context.Context) { log.Info("AppWorkPath: %s", setting.AppWorkPath) log.Info("Custom path: %s", setting.CustomPath) log.Info("Log path: %s", setting.LogRootPath) + log.Info("Configuration file: %s", setting.CustomConf) log.Info("Run Mode: %s", strings.Title(setting.RunMode)) // Setup i18n diff --git a/routers/install/setting.go b/routers/install/setting.go index 7b9b7bd8c2..e2af66cfb4 100644 --- a/routers/install/setting.go +++ b/routers/install/setting.go @@ -22,6 +22,7 @@ func PreloadSettings(ctx context.Context) bool { log.Info("AppWorkPath: %s", setting.AppWorkPath) log.Info("Custom path: %s", setting.CustomPath) log.Info("Log path: %s", setting.LogRootPath) + log.Info("Configuration file: %s", setting.CustomConf) log.Info("Preparing to run install page") translation.InitLocales() if setting.EnableSQLite3 { |