diff options
| author | Unknwon <u@gogs.io> | 2016-02-21 21:55:59 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-02-21 21:55:59 -0500 |
| commit | c9516c4c60684d20c45e4c0c15911603dc9f20b3 (patch) | |
| tree | e4afda4bf16392593a07ab8dcbc9ad71f32069a6 /cmd | |
| parent | 6e74dd4388dc41164e11491b38444cf6aa97f758 (diff) | |
| download | gitea-c9516c4c60684d20c45e4c0c15911603dc9f20b3.tar.gz gitea-c9516c4c60684d20c45e4c0c15911603dc9f20b3.zip | |
Fix wrong place to check disable SSH
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/serve.go | 11 | ||||
| -rw-r--r-- | cmd/update.go | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/cmd/serve.go b/cmd/serve.go index cca00b75cf..abfa46a241 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -42,11 +42,6 @@ func setup(logPath string) { setting.NewContext() log.NewGitLogger(filepath.Join(setting.LogRootPath, logPath)) - if setting.DisableSSH { - println("Gogs: SSH has been disabled") - os.Exit(1) - } - models.LoadConfigs() if setting.UseSQLite3 || setting.UseTiDB { @@ -138,8 +133,14 @@ func runServ(c *cli.Context) { if c.IsSet("config") { setting.CustomConf = c.String("config") } + setup("serv.log") + if setting.DisableSSH { + println("Gogs: SSH has been disabled") + return + } + if len(c.Args()) < 1 { fail("Not enough arguments", "Not enough arguments") } diff --git a/cmd/update.go b/cmd/update.go index 30f778f229..aca2a7cbe7 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -16,7 +16,7 @@ import ( var CmdUpdate = cli.Command{ Name: "update", - Usage: "This command should only be called by SSH shell", + Usage: "This command should only be called by Git hook", Description: `Update get pushed info and insert into database`, Action: runUpdate, Flags: []cli.Flag{ |