Updated to work with latest version of coffee script lexer/parser

lib/beanstalk_worker.coffee

@@ -1,41 +1,38 @@
-events: require 'events'
-client: require('beanstalk_client').Client
+events = require 'events'
+client = require('beanstalk_client').Client
 
 class BeanstalkWorker extends events.EventEmitter
 
-  constructor: (id, server, handlers, logger) ->
-    @id: id
-    @server: server
-    @handlers: handlers
-    @logger: logger || console
+  constructor: (@id, @server, @handlers, @logger) ->
+    @logger or= console
 
-    @stopped: false
+    @stopped = false
 
 
   start: (tubes, ignore_default) ->
     @log 'Starting...'
 
-    @on 'next', () =>
+    @on 'next', () => #this comes from the events.EventEmitter parent class
       @handle_next()
 
     client.connect @server, (err, conn) =>
       if err
         @log 'Error connecting: ' + err
       else
-        @connection: conn
+        @connection = conn
 
         @watch_tubes tubes, () =>
-          ignored: []
+          ignored = []
           if ignore_default
-          	ignored.push 'default'
+            ignored.push 'default'
 
           @ignore_tubes ignored, () =>
-          	@log 'Started'
-          	@emit 'next'
+            @log 'Started'
+            @emit 'next' #emit comes from the events.EventEmitter parent class
 
 
   watch_tubes: (tubes, done) ->
-    if tubes && (tube: tubes[0])
+    if tubes and (tube = tubes[0])
       @log 'Watching tube ' + tube
       @connection.watch tube, (err) =>
         if err
@@ -47,7 +44,7 @@ class BeanstalkWorker extends events.EventEmitter
 
 
   ignore_tubes: (tubes, done) ->
-    if tubes && (tube: tubes[0])
+    if tubes and (tube = tubes[0])
       @log 'Ignoring tube ' + tube
       @connection.ignore tube, (err) =>
         if err
@@ -60,7 +57,7 @@ class BeanstalkWorker extends events.EventEmitter
 
   stop: () ->
     @log 'Stopping...'
-    @stopped: true
+    @stopped = true
 
   find_handler: (job_type) ->
     for handler in @handlers
@@ -74,94 +71,106 @@ class BeanstalkWorker extends events.EventEmitter
       @log 'Stopped'
       return
 
-    @connection.reserve_with_timeout 5, (err, job_id, job_json) =>
+    @connection.reserve_with_timeout(5, (err, job_id, job_json) =>
       if err
         if 'TIMED_OUT' == err
-          @emit('next')
+          @emit 'next'
         else
           @log 'Error reserving job : ' + err.toString();
       else
+        job = null
+
         try
-          job: JSON.parse(job_json)
+          job = JSON.parse(job_json)
 
         catch e
-          job: null
           @log 'Error parsing job JSON : ' + job_id + ' : ' + e.toString()
 
         if job?
-          @handle_job(job_id, job)
+          @handle_job job_id, job
 
         else
-          @log 'Error handling job : ' + job_id + ' : couldn\'t parse job : ' + job_json
-          @bury_and_emit_next(job_id)
+          @log "Error handling job : #{job_id} : couldn't parse job : #{job_json}"
+          @bury_and_emit_next job_id
+    )
 
   handle_job: (job_id, job) ->
-    handler: @find_handler job.type
+    handler = @find_handler job.type
 
     if handler?
-      @run_handler_on_job_data(handler, job_id, job.data)
+      @run_handler_on_job_data handler, job_id, job.data
 
     else
-      @log 'Error handling job : ' + job_id + ' : no handler for ' + JSON.stringify(job)
-      @bury_and_emit_next(job_id)
+      @log "Error handling job : #{job_id} : no handler for #{JSON.stringify(job)}"
+      @bury_and_emit_next job_id
 
 
   run_handler_on_job_data: (handler, job_id, job_data) ->
-    start: new Date().getTime()
+    start = new Date().getTime()
 
     try
-      job_canceled: false
+      job_canceled = false
 
       handler job_data, (action, data) =>
 
         if !job_canceled
-          duration: new Date().getTime() - start
+          duration = new Date().getTime() - start
 
-          if !action? || ('next' == action)
-            @log 'Ran job : ' + job_id + ' in ' + duration + 'ms (' + JSON.stringify(job_data) + ')'
-            @destroy_and_emit_next(job_id)
+          #the following will emit next if the handler function doesn't call back with
+          #anything at all or if the first parameter is = to next
+          #TODO: what should be done with the data param if it is passed in from handler?
+          if !action? or ('next' == action)
+            @log "Ran job : #{job_id} in #{duration} ms (#{JSON.stringify(job_data)})"
+            @destroy_and_emit_next job_id
 
           else if 'release' == action
-            job_canceled: true
-            @log('Released job : ' + job_id + ' after ' + duration + 'ms')
-            @release_and_emit_next(job_id, data)
+            job_canceled = true
+            @log "Released job : #{job_id} after #{duration} ms)"
+            #in the function call to release_and_emit_next below we expect the
+            #data parameter we are passing through to be a whole number of
+            #seconds to delay before allowing the job to be retried?
+            @release_and_emit_next job_id, data
 
           else if 'bury' == action
-            @log('Buried job : ' + job_id)
-            @bury_and_emit_next(job_id)
+            @log 'Buried job : ' + job_id
+            @bury_and_emit_next job_id
 
           else
-            @log('Failed to run job : ' + job_id + ' : ' + reason)
+            reason = action
+            @log "Failed to run job : #{job_id} : #{reason}"
+            @bury_and_emit_next job_id
 
-    catch ex
-      @log 'Exception running job : ' + job_id + ' : ' + ex.toString()
-      @bury_and_emit_next(job_id)
+    catch e
+      @log "Exception running job : #{job_id} : #{e.toString()}"
+      @bury_and_emit_next job_id
 
 
   bury_and_emit_next: (job_id) ->
-    @connection.bury job_id, client.LOWEST_PRIORITY, (err) =>
+    @connection.bury(job_id, client.LOWEST_PRIORITY, (err) =>
       if err
-        @log 'Error burying job : ' + job_id + ' : ' + err.toString()
-      @emit('next')
+        @log "Error burying job : #{job_id} : #{err.toString()}"
+      @emit 'next'
+    )
 
 
   release_and_emit_next: (job_id, delay) ->
     if !delay?
-      delay: 30
-    @connection.release job_id, client.LOWEST_PRIORITY, delay, (err) =>
+      delay = 30 #TODO: is this the number of seconds to wait before job can retry?
+    @connection.release(job_id, client.LOWEST_PRIORITY, delay, (err) =>
       if err
-        @log 'Error releasing job : ' + job_id + ' : ' + err.toString()
-      @emit('next')
+        @log "Error releasing job : #{job_id} : #{err.toString()}"
+      @emit 'next'
+    )
 
 
   destroy_and_emit_next: (job_id) ->
-    @connection.destroy job_id, (err) =>
+    @connection.destroy(job_id, (err) =>
       if err
-        @log 'Error destroying job : ' + job_id + ' : ' + err.toString()
-      @emit('next')
-
+        @log "Error destroying job : #{job_id} : #{err.toString()}"
+      @emit 'next'
+    )
 
   log: (message) ->
-    @logger.log('[ ' + new Date().toString() + ' ] [ ' + process.pid + ' (' + @id + ') ] : ' + message)
+    @logger.log "[ #{new Date().toString()} ] [ #{process.pid} ( #{@id} ) ] : #{message}"
 
-exports.BeanstalkWorker: BeanstalkWorker
+exports.BeanstalkWorker = BeanstalkWorker