#279 pause 20s if rematching timeout >20s

AtlasOfLivingAustralia · Feb 8, 2024 · 35df2f9 · 35df2f9
1 parent a815dab
commit 35df2f9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/grails-app/controllers/au/org/ala/specieslist/SpeciesListController.groovy b/grails-app/controllers/au/org/ala/specieslist/SpeciesListController.groovy
@@ -545,6 +545,7 @@ class SpeciesListController {
         render(text: "${message(code: 'admin.lists.page.button.rematch.messages', default: 'Rematch complete')}")
     }
 
+
     private parseDataFromCSV(CSVReader csvReader, String separator) {
         def rawHeader = csvReader.readNext()
         log.debug(rawHeader.toList()?.toString())

diff --git a/grails-app/services/au/org/ala/specieslist/HelperService.groovy b/grails-app/services/au/org/ala/specieslist/HelperService.groovy
@@ -912,10 +912,10 @@ class HelperService {
             } else {
                 totalRows = SpeciesListItem.count();
                 //Total rematch - Clean matchedSpecies table
-//                MatchedSpecies.withTransaction {
-//                    MatchedSpecies.executeUpdate("delete from MatchedSpecies")
-//                    SpeciesListItem.executeUpdate("update SpeciesListItem set matched_species_id = null")
-//                }
+                MatchedSpecies.withTransaction {
+                    MatchedSpecies.executeUpdate("delete from MatchedSpecies")
+                    SpeciesListItem.executeUpdate("update SpeciesListItem set matched_species_id = null")
+                }
             }
         }
         RematchLog.withTransaction {
@@ -1002,7 +1002,7 @@ class HelperService {
                     rematchLog.remaining = totalRows - offset
                 }
                 RematchLog.withTransaction {
-                    def waitTime =  60 * 1000
+                    def waitTime =  30 * 1000
 
                     def timeUsed = TimeCategory.minus(new Date(), start).toMilliseconds()
                     if (timeUsed < waitTime) {
@@ -1011,9 +1011,12 @@ class HelperService {
                         rematchLog.recentProcessTime = new Date()
                         rematchLog.persist()
                     } else if (timeUsed >= waitTime ) {
-                        // More than 5 minutes
-                        log.info("Timeout. Rematching is aborted")
-                        throw new Exception("Aborted. ${items.last().id} was rematched!")
+                        // More than 30s
+                        rematchLog.logs = "Pause for ${waitTime} seconds"
+                        rematchLog.currentRecordId = items.last().id
+                        rematchLog.recentProcessTime = new Date()
+                        rematchLog.persist()
+                        sleep(waitTime)
                     }
                 }
             }// end full iteration