Mercurial > gemma
diff pkg/imports/queue.go @ 1327:cabf4789e02b
To make golint happier made context.Context to be the first argument of auth.RunAs.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Sun, 25 Nov 2018 15:56:07 +0100 |
| parents | 58acc343b1b6 |
| children | d753ce6cf588 |
line wrap: on
line diff
--- a/pkg/imports/queue.go Sun Nov 25 10:51:54 2018 +0100 +++ b/pkg/imports/queue.go Sun Nov 25 15:56:07 2018 +0100 @@ -160,7 +160,7 @@ func (q *importQueue) addJob(kind JobKind, user, data string) (int64, error) { ctx := context.Background() var id int64 - err := auth.RunAs(queueUser, ctx, func(conn *sql.Conn) error { + err := auth.RunAs(ctx, queueUser, func(conn *sql.Conn) error { return conn.QueryRowContext(ctx, insertJobSQL, string(kind), user, data).Scan(&id) }) if err == nil { @@ -180,7 +180,7 @@ func (lf logFeedback) log(kind, format string, args ...interface{}) { ctx := context.Background() - err := auth.RunAs(queueUser, ctx, func(conn *sql.Conn) error { + err := auth.RunAs(ctx, queueUser, func(conn *sql.Conn) error { _, err := conn.ExecContext( ctx, logMessageSQL, int64(lf), kind, fmt.Sprintf(format, args...)) return err @@ -215,7 +215,7 @@ func reEnqueueRunning() error { ctx := context.Background() - return auth.RunAs(queueUser, ctx, func(conn *sql.Conn) error { + return auth.RunAs(ctx, queueUser, func(conn *sql.Conn) error { _, err := conn.ExecContext(ctx, reEnqueueRunningSQL) return err }) @@ -248,7 +248,7 @@ var ji idJob ctx := context.Background() - err := auth.RunAs(queueUser, ctx, func(conn *sql.Conn) error { + err := auth.RunAs(ctx, queueUser, func(conn *sql.Conn) error { tx, err := conn.BeginTx(ctx, nil) if err != nil { return err @@ -275,7 +275,7 @@ func updateState(id int64, state string) error { ctx := context.Background() - return auth.RunAs(queueUser, ctx, func(conn *sql.Conn) error { + return auth.RunAs(ctx, queueUser, func(conn *sql.Conn) error { _, err := conn.ExecContext(ctx, updateStateSQL, state, id) return err }) @@ -283,7 +283,7 @@ func errorAndFail(id int64, format string, args ...interface{}) error { ctx := context.Background() - err := auth.RunAs(queueUser, ctx, func(conn *sql.Conn) error { + err := auth.RunAs(ctx, queueUser, func(conn *sql.Conn) error { tx, err := conn.BeginTx(ctx, nil) if err != nil { return err @@ -372,7 +372,7 @@ errDo := survive(func() error { ctx := context.Background() - return auth.RunAs(idj.user, ctx, + return auth.RunAs(ctx, idj.user, func(conn *sql.Conn) error { return job.Do(idj.id, ctx, conn, feedback) })