From dba8575058883da31c757fbea74c04c27ecade9f Mon Sep 17 00:00:00 2001
From: Myztiq <kahn@runnable.com>
Date: Mon, 29 Aug 2016 11:30:52 -0700
Subject: [PATCH 1/2] Added instance expired worker.

---
 lib/worker-server.js            |  3 ++-
 lib/workers/instance.expired.js | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 lib/workers/instance.expired.js

diff --git a/lib/worker-server.js b/lib/worker-server.js
index d3a456955..1bbf52a31 100644
--- a/lib/worker-server.js
+++ b/lib/worker-server.js
@@ -68,7 +68,8 @@ WorkerServer.listen = function () {
       'dock.removed': require('workers/dock.removed'),
       'docker.events-stream.connected': require('workers/docker.events-stream.connected'),
       'docker.events-stream.disconnected': require('workers/docker.events-stream.disconnected'),
-      'instance.container.errored': require('workers/instance.container.errored')
+      'instance.container.errored': require('workers/instance.container.errored'),
+      'instance.expired': require('workers/instance.expired')
     }
   })
 
diff --git a/lib/workers/instance.expired.js b/lib/workers/instance.expired.js
new file mode 100644
index 000000000..85e74a5fd
--- /dev/null
+++ b/lib/workers/instance.expired.js
@@ -0,0 +1,21 @@
+'use strict'
+var Promise = require('bluebird')
+
+var logger = require('logger')
+var rabbitMQ = require('models/rabbitmq')
+
+module.exports = InstanceExpired
+
+/**
+ * Handle instance expired event
+ * @param {Object} job
+ * @param {String} job.instanceId - Instance ID which has been marked as expired
+ * @returns {Promise} - Resolves when rabbitMQ delete event has been triggered.
+ */
+function InstanceExpired (job) {
+  var log = logger.child({ method: 'InstanceExpired' })
+  log.info('InstanceExpired called')
+  return Promise.try(function () {
+    rabbitMQ.deleteInstance(job)
+  })
+}

From 154182b393f7bf5d4be907237e10a79456c2eb3f Mon Sep 17 00:00:00 2001
From: Myztiq <kahn@runnable.com>
Date: Mon, 29 Aug 2016 13:20:09 -0700
Subject: [PATCH 2/2] Created a mapping for instance.expired -> instance.delete
 worker.

---
 lib/worker-server.js            |  2 +-
 lib/workers/instance.expired.js | 21 ---------------------
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 lib/workers/instance.expired.js

diff --git a/lib/worker-server.js b/lib/worker-server.js
index 1bbf52a31..946799180 100644
--- a/lib/worker-server.js
+++ b/lib/worker-server.js
@@ -69,7 +69,7 @@ WorkerServer.listen = function () {
       'docker.events-stream.connected': require('workers/docker.events-stream.connected'),
       'docker.events-stream.disconnected': require('workers/docker.events-stream.disconnected'),
       'instance.container.errored': require('workers/instance.container.errored'),
-      'instance.expired': require('workers/instance.expired')
+      'instance.expired': require('workers/instance.delete')
     }
   })
 
diff --git a/lib/workers/instance.expired.js b/lib/workers/instance.expired.js
deleted file mode 100644
index 85e74a5fd..000000000
--- a/lib/workers/instance.expired.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use strict'
-var Promise = require('bluebird')
-
-var logger = require('logger')
-var rabbitMQ = require('models/rabbitmq')
-
-module.exports = InstanceExpired
-
-/**
- * Handle instance expired event
- * @param {Object} job
- * @param {String} job.instanceId - Instance ID which has been marked as expired
- * @returns {Promise} - Resolves when rabbitMQ delete event has been triggered.
- */
-function InstanceExpired (job) {
-  var log = logger.child({ method: 'InstanceExpired' })
-  log.info('InstanceExpired called')
-  return Promise.try(function () {
-    rabbitMQ.deleteInstance(job)
-  })
-}