From fdc1ad28989b3cbe9614195d5d037d705e7a0038 Mon Sep 17 00:00:00 2001
From: Brian Gough <bjg@network-theory.co.uk>
Date: Fri, 1 Apr 2016 15:35:14 +0100
Subject: [PATCH] use logger.error message as title of sentry report

---
 libraries/logger/logging-manager.coffee | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/libraries/logger/logging-manager.coffee b/libraries/logger/logging-manager.coffee
index 7bfec073ab..1640fc6ea4 100644
--- a/libraries/logger/logging-manager.coffee
+++ b/libraries/logger/logging-manager.coffee
@@ -12,16 +12,27 @@ module.exports = Logger =
 		@raven = new raven.Client(sentry_dsn, options)
 
 	captureException: (attributes, message, level) ->
-		error = attributes.err or attributes.error or message
-		req = attributes.req
+		# handle case of logger.error "message"
+		if typeof attributes is 'string'
+			attributes = {err: attributes}
+		# extract any error object
+		error = attributes.err or attributes.error
+		# use our log message as the title when available
+		if not error?
+			error = {message: message} if typeof message is 'string'
+		else if message?
+			error.exception = error.message
+			error.message = message
+		# report the error
 		if error?
+			# capture attributes and use *_id objects as tags
 			tags = {}
 			extra = {}
-			# capture attributes and use *_id objects as tags
 			for key, value of attributes
 				tags[key] = value if key.match(/_id/) and typeof value == 'string'
 				extra[key] = value
 			# capture req object if available
+			req = attributes.req
 			if req?
 				extra.req =
 					method: req.method