diff --git a/models/bots/runner.go b/models/bots/runner.go index 4fc5e2dd7d..0299c80d93 100644 --- a/models/bots/runner.go +++ b/models/bots/runner.go @@ -259,20 +259,6 @@ func GetRunnerByID(id int64) (*Runner, error) { return &runner, nil } -// GetRunnerByToken returns a bot runner via token -func GetRunnerByToken(token string) (*Runner, error) { - var runner Runner - has, err := db.GetEngine(db.DefaultContext).Where("token=?", token).Get(&runner) - if err != nil { - return nil, err - } else if !has { - return nil, ErrRunnerNotExist{ - Token: token, - } - } - return &runner, nil -} - // UpdateRunner updates runner's information. func UpdateRunner(ctx context.Context, r *Runner, cols ...string) error { e := db.GetEngine(ctx) diff --git a/models/bots/runner_token.go b/models/bots/runner_token.go index 42cdadbbdb..4798bb06a4 100644 --- a/models/bots/runner_token.go +++ b/models/bots/runner_token.go @@ -49,7 +49,7 @@ func init() { db.RegisterModel(new(RunnerToken)) } -// GetRunnerByToken returns a bot runner via token +// GetRunnerToken returns a bot runner via token func GetRunnerToken(token string) (*RunnerToken, error) { var runnerToken RunnerToken has, err := db.GetEngine(db.DefaultContext).Where("token=?", token).Get(&runnerToken) diff --git a/services/auth/basic.go b/services/auth/basic.go index 88f504af97..5d7be7042c 100644 --- a/services/auth/basic.go +++ b/services/auth/basic.go @@ -119,7 +119,7 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore return user_model.NewBotUser() } else { - log.Error("GetRunnerByToken: %v %v", task, err) + log.Error("GetTaskByToken: %v %v", task, err) } if !setting.Service.EnableBasicAuth {