diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2021-12-01 15:50:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-01 15:50:01 +0800 |
| commit | 042cac5fedeec8af53080b9666fe043072f3a6be (patch) | |
| tree | b13d57faa71ba8bc9f8b3d40f5be7e3735ac66a4 /routers/install/setting.go | |
| parent | a3517d8668482b58cb80ba10a956fe4e27e1a429 (diff) | |
| download | gitea-042cac5fedeec8af53080b9666fe043072f3a6be.tar.gz gitea-042cac5fedeec8af53080b9666fe043072f3a6be.zip | |
Improve install code to avoid low-level mistakes. (#17779)
* Improve install code to avoid low-level mistakes.
If a user tries to do a re-install in a Gitea database, they gets a warning and double check.
When Gitea runs, it never create empty app.ini automatically.
Also some small (related) refactoring:
* Refactor db.InitEngine related logic make it more clean (especially for the install code)
* Move some i18n strings out from setting.go to make the setting.go can be easily maintained.
* Show errors in CLI code if an incorrect app.ini is used.
* APP_DATA_PATH is created when installing, and checked when starting (no empty directory is created any more).
Diffstat (limited to 'routers/install/setting.go')
| -rw-r--r-- | routers/install/setting.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/routers/install/setting.go b/routers/install/setting.go index e2af66cfb4..cf0a01ce31 100644 --- a/routers/install/setting.go +++ b/routers/install/setting.go @@ -16,17 +16,17 @@ import ( // PreloadSettings preloads the configuration to check if we need to run install func PreloadSettings(ctx context.Context) bool { - setting.NewContext() + setting.LoadAllowEmpty() if !setting.InstallLock { log.Info("AppPath: %s", setting.AppPath) 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") + log.Info("Prepare to run install page") translation.InitLocales() if setting.EnableSQLite3 { - log.Info("SQLite3 Supported") + log.Info("SQLite3 is supported") } setting.InitDBConfig() setting.NewServicesForInstall() @@ -36,9 +36,9 @@ func PreloadSettings(ctx context.Context) bool { return !setting.InstallLock } -// ReloadSettings rereads the settings and starts up the database -func ReloadSettings(ctx context.Context) { - setting.NewContext() +// reloadSettings reloads the existing settings and starts up the database +func reloadSettings(ctx context.Context) { + setting.LoadFromExisting() setting.InitDBConfig() if setting.InstallLock { if err := common.InitDBEngine(ctx); err == nil { |