renamed expire command

timgit · Apr 1, 2017 · ccbb848 · ccbb848
1 parent e1dc44c
commit ccbb848
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/src/manager.js b/src/manager.js
@@ -17,7 +17,7 @@ class Manager extends EventEmitter {
     this.db = db;
 
     this.nextJobCommand = plans.fetchNextJob(config.schema);
-    this.expireJobCommand = plans.expireJob(config.schema);
+    this.expireCommand = plans.expire(config.schema);
     this.insertJobCommand = plans.insertJob(config.schema);
     this.completeJobCommand = plans.completeJob(config.schema);
     this.cancelJobCommand = plans.cancelJob(config.schema);
@@ -32,7 +32,7 @@ class Manager extends EventEmitter {
     return expire().then(init);
 
     function expire() {
-      return self.db.executeSql(self.expireJobCommand)
+      return self.db.executeSql(self.expireCommand)
         .then(result => {
           if (result.rows.length){
             self.emit('expired-count', result.rows.length);

diff --git a/src/plans.js b/src/plans.js
@@ -6,11 +6,11 @@ module.exports = {
   getVersion,
   versionTableExists,
   fetchNextJob,
-  expireJob,
   completeJob,
   cancelJob,
   failJob,
   insertJob,
+  expire,
   archive,
   expireJobSuffix
 };
@@ -138,20 +138,6 @@ function fetchNextJob(schema) {
   `;
 }
 
-function expireJob(schema) {
-  return `
-    WITH expired AS (
-      UPDATE ${schema}.job
-      SET state = CASE WHEN retryCount < retryLimit THEN 'retry'::${schema}.job_state ELSE 'expired'::${schema}.job_state END,        
-        completedOn = CASE WHEN retryCount < retryLimit THEN NULL ELSE now() END
-      WHERE state = 'active'
-        AND (startedOn + expireIn) < now()    
-      RETURNING id, name, state, data
-    )
-    SELECT id, name, data FROM expired WHERE state = 'expired';
-  `;
-}
-
 function completeJob(schema){
   return `
     UPDATE ${schema}.job
@@ -193,6 +179,20 @@ function insertJob(schema) {
   `;
 }
 
+function expire(schema) {
+  return `
+    WITH expired AS (
+      UPDATE ${schema}.job
+      SET state = CASE WHEN retryCount < retryLimit THEN 'retry'::${schema}.job_state ELSE 'expired'::${schema}.job_state END,        
+        completedOn = CASE WHEN retryCount < retryLimit THEN NULL ELSE now() END
+      WHERE state = 'active'
+        AND (startedOn + expireIn) < now()    
+      RETURNING id, name, state, data
+    )
+    SELECT id, name, data FROM expired WHERE state = 'expired';
+  `;
+}
+
 function archive(schema) {
   return `
     DELETE FROM ${schema}.job