| @@ -82,7 +82,7 @@ func runServ(c *cli.Context) { | |||||
| } | } | ||||
| if len(c.Args()) < 1 { | if len(c.Args()) < 1 { | ||||
| fail("Not enough arguments", "Not enough arugments") | |||||
| fail("Not enough arguments", "Not enough arguments") | |||||
| } | } | ||||
| keys := strings.Split(c.Args()[0], "-") | keys := strings.Split(c.Args()[0], "-") | ||||
| @@ -97,7 +97,7 @@ func runServ(c *cli.Context) { | |||||
| user, err := models.GetUserByKeyId(keyId) | user, err := models.GetUserByKeyId(keyId) | ||||
| if err != nil { | if err != nil { | ||||
| fail("internal error", "Fail to get user by key ID(%d): %v", keyId, err) | |||||
| fail("internal error", "Failed to get user by key ID(%d): %v", keyId, err) | |||||
| } | } | ||||
| cmd := os.Getenv("SSH_ORIGINAL_COMMAND") | cmd := os.Getenv("SSH_ORIGINAL_COMMAND") | ||||
| @@ -113,7 +113,7 @@ func runServ(c *cli.Context) { | |||||
| repoPath := strings.Trim(args, "'") | repoPath := strings.Trim(args, "'") | ||||
| rr := strings.SplitN(repoPath, "/", 2) | rr := strings.SplitN(repoPath, "/", 2) | ||||
| if len(rr) != 2 { | if len(rr) != 2 { | ||||
| fail("Invalid repository path", "Invalide repository path: %v", args) | |||||
| fail("Invalid repository path", "Invalid repository path: %v", args) | |||||
| } | } | ||||
| repoUserName := rr[0] | repoUserName := rr[0] | ||||
| repoName := strings.TrimSuffix(rr[1], ".git") | repoName := strings.TrimSuffix(rr[1], ".git") | ||||
| @@ -123,7 +123,7 @@ func runServ(c *cli.Context) { | |||||
| if err == models.ErrUserNotExist { | if err == models.ErrUserNotExist { | ||||
| fail("Repository owner does not exist", "Unregistered owner: %s", repoUserName) | fail("Repository owner does not exist", "Unregistered owner: %s", repoUserName) | ||||
| } | } | ||||
| fail("Internal error", "Fail to get repository owner(%s): %v", repoUserName, err) | |||||
| fail("Internal error", "Failed to get repository owner(%s): %v", repoUserName, err) | |||||
| } | } | ||||
| repo, err := models.GetRepositoryByName(repoUser.Id, repoName) | repo, err := models.GetRepositoryByName(repoUser.Id, repoName) | ||||
| @@ -135,7 +135,7 @@ func runServ(c *cli.Context) { | |||||
| fail(_ACCESS_DENIED_MESSAGE, "Repository does not exist: %s/%s", repoUser.Name, repoName) | fail(_ACCESS_DENIED_MESSAGE, "Repository does not exist: %s/%s", repoUser.Name, repoName) | ||||
| } | } | ||||
| } | } | ||||
| fail("Internal error", "Fail to get repository: %v", err) | |||||
| fail("Internal error", "Failed to get repository: %v", err) | |||||
| } | } | ||||
| requestedMode, has := COMMANDS[verb] | requestedMode, has := COMMANDS[verb] | ||||
| @@ -171,7 +171,7 @@ func runServ(c *cli.Context) { | |||||
| gitcmd.Stdin = os.Stdin | gitcmd.Stdin = os.Stdin | ||||
| gitcmd.Stderr = os.Stderr | gitcmd.Stderr = os.Stderr | ||||
| if err = gitcmd.Run(); err != nil { | if err = gitcmd.Run(); err != nil { | ||||
| fail("Internal error", "Fail to execute git command: %v", err) | |||||
| fail("Internal error", "Failed to execute git command: %v", err) | |||||
| } | } | ||||
| if requestedMode == models.ACCESS_MODE_WRITE { | if requestedMode == models.ACCESS_MODE_WRITE { | ||||
| @@ -184,7 +184,7 @@ func runServ(c *cli.Context) { | |||||
| err = models.Update(task.RefName, task.OldCommitId, task.NewCommitId, | err = models.Update(task.RefName, task.OldCommitId, task.NewCommitId, | ||||
| user.Name, repoUserName, repoName, user.Id) | user.Name, repoUserName, repoName, user.Id) | ||||
| if err != nil { | if err != nil { | ||||
| log.GitLogger.Error(2, "Fail to update: %v", err) | |||||
| log.GitLogger.Error(2, "Failed to update: %v", err) | |||||
| } | } | ||||
| } | } | ||||