mirror of
https://github.com/simon987/task_tracker.git
synced 2025-12-11 14:08:52 +00:00
Add per project rate limit
This commit is contained in:
simon987
@@ -3,21 +3,24 @@ package storage
|
||||
import (
|
||||
"database/sql"
|
||||
"github.com/Sirupsen/logrus"
|
||||
"golang.org/x/time/rate"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type Project struct {
|
||||
Id int64 `json:"id"`
|
||||
Priority int64 `json:"priority"`
|
||||
Name string `json:"name"`
|
||||
CloneUrl string `json:"clone_url"`
|
||||
GitRepo string `json:"git_repo"`
|
||||
Version string `json:"version"`
|
||||
Motd string `json:"motd"`
|
||||
Public bool `json:"public"`
|
||||
Hidden bool `json:"hidden"`
|
||||
Chain int64 `json:"chain"`
|
||||
Paused bool `json:"paused"`
|
||||
Id int64 `json:"id"`
|
||||
Priority int64 `json:"priority"`
|
||||
Name string `json:"name"`
|
||||
CloneUrl string `json:"clone_url"`
|
||||
GitRepo string `json:"git_repo"`
|
||||
Version string `json:"version"`
|
||||
Motd string `json:"motd"`
|
||||
Public bool `json:"public"`
|
||||
Hidden bool `json:"hidden"`
|
||||
Chain int64 `json:"chain"`
|
||||
Paused bool `json:"paused"`
|
||||
AssignRate rate.Limit `json:"assign_rate"`
|
||||
SubmitRate rate.Limit `json:"submit_rate"`
|
||||
}
|
||||
|
||||
type AssignedTasks struct {
|
||||
@@ -29,10 +32,11 @@ func (database *Database) SaveProject(project *Project, webhookSecret string) (i
|
||||
db := database.getDB()
|
||||
|
||||
row := db.QueryRow(`INSERT INTO project (name, git_repo, clone_url, version, priority,
|
||||
motd, public, hidden, chain, paused, webhook_secret)
|
||||
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,NULLIF($9, 0),$10,$11) RETURNING id`,
|
||||
motd, public, hidden, chain, paused, webhook_secret, assign_rate, submit_rate)
|
||||
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,NULLIF($9, 0),$10,$11,$12,$13) RETURNING id`,
|
||||
project.Name, project.GitRepo, project.CloneUrl, project.Version, project.Priority, project.Motd,
|
||||
project.Public, project.Hidden, project.Chain, project.Paused, webhookSecret)
|
||||
project.Public, project.Hidden, project.Chain, project.Paused, webhookSecret, project.AssignRate,
|
||||
project.SubmitRate)
|
||||
|
||||
var id int64
|
||||
err := row.Scan(&id)
|
||||
@@ -58,7 +62,7 @@ func (database *Database) GetProject(id int64) *Project {
|
||||
|
||||
db := database.getDB()
|
||||
row := db.QueryRow(`SELECT id, priority, name, clone_url, git_repo, version,
|
||||
motd, public, hidden, COALESCE(chain, 0), paused
|
||||
motd, public, hidden, COALESCE(chain, 0), paused, assign_rate, submit_rate
|
||||
FROM project WHERE id=$1`, id)
|
||||
|
||||
project, err := scanProject(row)
|
||||
@@ -81,7 +85,7 @@ func scanProject(row *sql.Row) (*Project, error) {
|
||||
|
||||
p := &Project{}
|
||||
err := row.Scan(&p.Id, &p.Priority, &p.Name, &p.CloneUrl, &p.GitRepo, &p.Version,
|
||||
&p.Motd, &p.Public, &p.Hidden, &p.Chain, &p.Paused)
|
||||
&p.Motd, &p.Public, &p.Hidden, &p.Chain, &p.Paused, &p.AssignRate, &p.SubmitRate)
|
||||
|
||||
return p, err
|
||||
}
|
||||
@@ -90,7 +94,8 @@ func (database *Database) GetProjectWithRepoName(repoName string) *Project {
|
||||
|
||||
db := database.getDB()
|
||||
row := db.QueryRow(`SELECT id, priority, name, clone_url, git_repo, version,
|
||||
motd, public, hidden, COALESCE(chain, 0), paused FROM project WHERE LOWER(git_repo)=$1`,
|
||||
motd, public, hidden, COALESCE(chain, 0), paused, assign_rate, submit_rate
|
||||
FROM project WHERE LOWER(git_repo)=$1`,
|
||||
strings.ToLower(repoName))
|
||||
|
||||
project, err := scanProject(row)
|
||||
@@ -109,11 +114,13 @@ func (database *Database) UpdateProject(project *Project) error {
|
||||
db := database.getDB()
|
||||
|
||||
res, err := db.Exec(`UPDATE project
|
||||
SET (priority, name, clone_url, git_repo, version, motd, public, hidden, chain, paused) =
|
||||
($1,$2,$3,$4,$5,$6,$7,$8,NULLIF($9, 0), $10)
|
||||
WHERE id=$11`,
|
||||
SET (priority, name, clone_url, git_repo, version, motd, public, hidden, chain, paused,
|
||||
assign_rate, submit_rate) =
|
||||
($1,$2,$3,$4,$5,$6,$7,$8,NULLIF($9, 0), $10,$11,$12)
|
||||
WHERE id=$13`,
|
||||
project.Priority, project.Name, project.CloneUrl, project.GitRepo, project.Version, project.Motd,
|
||||
project.Public, project.Hidden, project.Chain, project.Paused, project.Id)
|
||||
project.Public, project.Hidden, project.Chain, project.Paused, project.AssignRate, project.SubmitRate,
|
||||
project.Id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package storage
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/Sirupsen/logrus"
|
||||
@@ -69,75 +68,6 @@ func (database *Database) SaveTask(task *Task, project int64, hash64 int64, wid
|
||||
return nil
|
||||
}
|
||||
|
||||
func (database *Database) GetTask(worker *Worker) *Task {
|
||||
|
||||
db := database.getDB()
|
||||
|
||||
row := db.QueryRow(`
|
||||
UPDATE task
|
||||
SET assignee=$1, assign_time=extract(epoch from now() at time zone 'utc')
|
||||
WHERE id IN
|
||||
(
|
||||
SELECT task.id
|
||||
FROM task
|
||||
INNER JOIN project project on task.project = project.id
|
||||
LEFT JOIN worker_verifies_task wvt on task.id = wvt.task AND wvt.worker=$1
|
||||
WHERE NOT project.paused AND assignee IS NULL AND task.status=1
|
||||
AND (project.public OR (
|
||||
SELECT a.role_assign AND not a.request FROM worker_access a WHERE a.worker=$1 AND a.project=project.id
|
||||
))
|
||||
AND wvt.task IS NULL
|
||||
ORDER BY project.priority DESC, task.priority DESC
|
||||
LIMIT 1
|
||||
)
|
||||
RETURNING id`, worker.Id)
|
||||
var id int64
|
||||
|
||||
err := row.Scan(&id)
|
||||
if err != nil {
|
||||
logrus.WithError(err).WithFields(logrus.Fields{
|
||||
"worker": worker,
|
||||
}).Trace("No task available")
|
||||
return nil
|
||||
}
|
||||
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"id": id,
|
||||
"worker": worker,
|
||||
}).Trace("Database.getTask UPDATE task")
|
||||
|
||||
task := getTaskById(id, db)
|
||||
|
||||
return task
|
||||
}
|
||||
|
||||
func getTaskById(id int64, db *sql.DB) *Task {
|
||||
|
||||
row := db.QueryRow(`
|
||||
SELECT task.id, task.priority, task.project, assignee, retries, max_retries,
|
||||
status, recipe, max_assign_time, assign_time, verification_count, project.priority, project.name,
|
||||
project.clone_url, project.git_repo, project.version, project.motd, project.public, COALESCE(project.chain,0) FROM task
|
||||
INNER JOIN project project ON task.project = project.id
|
||||
WHERE task.id=$1`, id)
|
||||
project := &Project{}
|
||||
task := &Task{}
|
||||
task.Project = project
|
||||
|
||||
err := row.Scan(&task.Id, &task.Priority, &project.Id, &task.Assignee,
|
||||
&task.Retries, &task.MaxRetries, &task.Status, &task.Recipe, &task.MaxAssignTime,
|
||||
&task.AssignTime, &task.VerificationCount, &project.Priority, &project.Name,
|
||||
&project.CloneUrl, &project.GitRepo, &project.Version, &project.Motd, &project.Public,
|
||||
&project.Chain)
|
||||
handleErr(err)
|
||||
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"id": id,
|
||||
"task": task,
|
||||
}).Trace("Database.getTaskById SELECT task")
|
||||
|
||||
return task
|
||||
}
|
||||
|
||||
func (database Database) ReleaseTask(id int64, workerId int64, result TaskResult, verification int64) bool {
|
||||
|
||||
db := database.getDB()
|
||||
@@ -205,12 +135,24 @@ func (database *Database) GetTaskFromProject(worker *Worker, projectId int64) *T
|
||||
return nil
|
||||
}
|
||||
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"id": id,
|
||||
"worker": worker,
|
||||
}).Trace("Database.getTask UPDATE task")
|
||||
row = db.QueryRow(`
|
||||
SELECT task.id, task.priority, task.project, assignee, retries, max_retries,
|
||||
status, recipe, max_assign_time, assign_time, verification_count, project.priority, project.name,
|
||||
project.clone_url, project.git_repo, project.version, project.motd, project.public, COALESCE(project.chain,0),
|
||||
project.assign_rate, project.submit_rate
|
||||
FROM task
|
||||
INNER JOIN project project ON task.project = project.id
|
||||
WHERE task.id=$1`, id)
|
||||
project := &Project{}
|
||||
task := &Task{}
|
||||
task.Project = project
|
||||
|
||||
task := getTaskById(id, db)
|
||||
err = row.Scan(&task.Id, &task.Priority, &project.Id, &task.Assignee,
|
||||
&task.Retries, &task.MaxRetries, &task.Status, &task.Recipe, &task.MaxAssignTime,
|
||||
&task.AssignTime, &task.VerificationCount, &project.Priority, &project.Name,
|
||||
&project.CloneUrl, &project.GitRepo, &project.Version, &project.Motd, &project.Public,
|
||||
&project.Chain, &project.AssignRate, &project.SubmitRate)
|
||||
handleErr(err)
|
||||
|
||||
return task
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user