fix: ejudge poll size config

Gornak40 · May 9, 2024 · dc6733e · dc6733e
1 parent c45524f
commit dc6733e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -18,6 +18,7 @@ SQLITE_PATH = <PATH>
 [server]
 GIN_SECRET = <SECRET>
 JWT_SECRET = <SECRET>
+POLL_MAX_RUNS = 1000
 POLL_DELAY_SECONDS = 10
 REVIEW_LIMIT = 3
 ```

diff --git a/config/config.go b/config/config.go
@@ -27,6 +27,7 @@ type DBConfig struct {
 type ServerConfig struct {
 	GinSecret        string `ini:"GIN_SECRET"`
 	JWTSecret        string `ini:"JWT_SECRET"`
+	PollMaxRuns      int64  `ini:"POLL_MAX_RUNS"`
 	PollDelaySeconds int64  `ini:"POLL_DELAY_SECONDS"`
 	ReviewLimit      int64  `ini:"REVIEW_LIMIT"`
 }

diff --git a/controller/index.go b/controller/index.go
@@ -127,7 +127,7 @@ func (s *Server) IndexPOST(c *gin.Context) {
 
 func (s *Server) reviewValid(user string, contestID uint, problem string) error {
 	filter := fmt.Sprintf("login == '%s' && prob == '%s' && status == OK", user, problem)
-	runs, err := s.ej.GetContestRuns(contestID, filter)
+	runs, err := s.ej.GetContestRuns(contestID, filter, 1)
 	if err != nil {
 		return err
 	}

diff --git a/controller/poller.go b/controller/poller.go
@@ -39,7 +39,7 @@ func runStatusFromDB(dbStatus *models.Run) *ejudge.EjStatusChange {
 }
 
 func (s *Server) pollContest(dbContest *models.Contest) error {
-	runs, err := s.ej.GetContestRuns(dbContest.EjudgeID, "status == PR")
+	runs, err := s.ej.GetContestRuns(dbContest.EjudgeID, "status == PR", int(s.cfg.PollMaxRuns))
 	if err != nil {
 		return err
 	}
@@ -71,7 +71,7 @@ func (s *Server) pollContest(dbContest *models.Contest) error {
 			if err := s.ej.ChangeRunStatus(status); err != nil {
 				logrus.WithError(err).Error("failed to change run status")
 			}
-			logrus.WithField("runID", dbRun.EjudgeID).Info("run review is done")
+			logrus.WithField("runID", dbRun.EjudgeID).Info("run review done")
 			if err := s.db.Delete(&dbRun).Error; err != nil { //nolint:gosec // G601: Implicit memory aliasing in for loop.
 				logrus.WithError(err).Error("failed to delete run")
 			}

diff --git a/pkg/ejudge/runs.go b/pkg/ejudge/runs.go
@@ -68,12 +68,13 @@ type EjRuns struct {
 	TotalRuns uint    `json:"total_runs"`
 }
 
-func (ej *EjClient) GetContestRuns(id uint, filter string) (*EjRuns, error) {
+func (ej *EjClient) GetContestRuns(id uint, filter string, count int) (*EjRuns, error) {
 	fieldMask := getFieldMask(ejRunID, ejUserLogin, ejUserName, ejResult, ejProbName)
 
 	params := url.Values{
 		"contest_id":  {strconv.Itoa(int(id))},
 		"filter_expr": {filter},
+		"last_run":    {strconv.Itoa(-count)}, // some ejudge stuff
 		"field_mask":  {fieldMask},
 	}
 	answer, err := ej.shootEjAPIGet(context.TODO(), "ej/api/v1/master/list-runs-json", params)