Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/executionModes/baseExecutionMode.coffee
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
_ = require "lodash"
convert = require "convert-units"
Promise = require "bluebird"

module.exports =
class BaseExecutionMode
Expand All @@ -21,3 +22,7 @@ module.exports =
_nextTimeout: (reader, message) ->
if _.isEmpty message then convert(reader.waitingTime).from("s").to("ms") else 0

handleError: (err, reader, keepAliveMessage, message) ->
reader.emit "job_error", { method: "executionMode.execute", err, message }
Promise.resolve()
.tap -> keepAliveMessage.destroy()
7 changes: 7 additions & 0 deletions src/executionModes/onceExecutionMode.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,10 @@ module.exports =
.tap () => reader.emit "job-finish"
.tap () => process.exit 0

handleError: (err, reader, keepAliveMessage, message) ->
super err, reader, keepAliveMessage, message
.then () =>
reader.emit "job-error-finish"
process.exit 1


4 changes: 2 additions & 2 deletions src/longTaskQueueReader.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ eventsToLog = (logger) ->
"job-get-messages": -> logger.info "Obteniendo mensajes nuevas"
"job-finish-messages": -> logger.info "Finalizo la ejecucion de mensajes"
"job-finish": -> logger.info "Finalizo la ejecucion"
"job-error-finish": -> logger.info "Finalizo la ejecucion por un error"
"message-start": (message) -> logger.info "Iniciando el proceso de un mensaje", message
"message-finish": (message) -> logger.info "Finalizo la ejecucion de un proceso", message
"message-touch": ({ messageId, MessageId, messageText, Body }) -> logger.info "Touching #{messageId or MessageId}", messageText or Body
Expand Down Expand Up @@ -38,8 +39,7 @@ module.exports =
.execute()
.tap => @_removeSafety message
.catch MaxRetriesExceededException, (e) => @_sendToPoison message
.catch (err) => @emit "job_error", { method: "_execute", err, message }
.tap -> keepAliveMessage.destroy()
.catch (err) => @executionMode.handleError(err, @, keepAliveMessage, message)
.then => @emit "message-finish", message

_sendToPoison: (message) =>
Expand Down
Loading