Merge pull request #4359 from RocketChat/improvements/2837

Improve outgoing/incoming webhook logs

packages/rocketchat-integrations/server/api/api.coffee

@@ -20,7 +20,7 @@ getIntegrationScript = (integration) ->
 				return store[key]
 
 	try
-		logger.incoming.info 'will evaluate script'
+		logger.incoming.info 'Will evaluate script of Trigger', integration.name
 		logger.incoming.debug script
 
 		vmScript = vm.createScript script, 'script.js'
@@ -34,13 +34,14 @@ getIntegrationScript = (integration) ->
 
 			return compiledScripts[integration._id].script
 	catch e
-		logger.incoming.error "[Error evaluating Script:]"
+		logger.incoming.error '[Error evaluating Script in Trigger', integration.name, ':]'
 		logger.incoming.error script.replace(/^/gm, '  ')
 		logger.incoming.error "[Stack:]"
 		logger.incoming.error e.stack.replace(/^/gm, '  ')
 		throw RocketChat.API.v1.failure 'error-evaluating-script'
 
 	if not sandbox.Script?
+		logger.incoming.error '[Class "Script" not in Trigger', integration.name, ']'
 		throw RocketChat.API.v1.failure 'class-script-not-found'
 
 
@@ -159,9 +160,10 @@ executeIntegrationRest = ->
 
 			@bodyParams = result?.content
 
+			logger.incoming.debug '[Process Incoming Request result of Trigger', @integration.name, ':]'
 			logger.incoming.debug 'result', @bodyParams
 		catch e
-			logger.incoming.error "[Error running Script:]"
+			logger.incoming.error '[Error running Script in Trigger', @integration.name, ':]'
 			logger.incoming.error @integration.scriptCompiled.replace(/^/gm, '  ')
 			logger.incoming.error "[Stack:]"
 			logger.incoming.error e.stack.replace(/^/gm, '  ')

packages/rocketchat-integrations/server/triggers.coffee

@@ -28,7 +28,7 @@ getIntegrationScript = (integration) ->
 					error: e
 
 	try
-		logger.outgoing.info 'will evaluate script'
+		logger.outgoing.info 'Will evaluate script of Trigger', integration.name
 		logger.outgoing.debug script
 
 		vmScript = vm.createScript script, 'script.js'
@@ -42,14 +42,14 @@ getIntegrationScript = (integration) ->
 
 			return compiledScripts[integration._id].script
 	catch e
-		logger.outgoing.error "[Error evaluating Script:]"
+		logger.outgoing.error '[Error evaluating Script in Trigger', integration.name, ':]'
 		logger.outgoing.error script.replace(/^/gm, '  ')
 		logger.outgoing.error "[Stack:]"
 		logger.outgoing.error e.stack.replace(/^/gm, '  ')
 		throw new Meteor.Error 'error-evaluating-script'
 
 	if not sandbox.Script?
-		logger.outgoing.error "[Class 'Script' not found]"
+		logger.outgoing.error '[Class "Script" not in Trigger', integration.name, ']'
 		throw new Meteor.Error 'class-script-not-found'
 
 
@@ -75,17 +75,18 @@ executeScript = (integration, method, params) ->
 		return
 
 	if not script[method]?
-		logger.outgoing.error "[Method '#{method}' not found]"
+		logger.outgoing.error '[Method "', method, '" not found in Trigger', integration.name, ']'
 		return
 
 	try
 		result = script[method](params)
 
-		logger.outgoing.debug 'result', result
+		logger.outgoing.debug '[Script method [', method, '] result of Trigger', integration.name, ':]'
+		logger.outgoing.debug result
 
 		return result
 	catch e
-		logger.incoming.error "[Error running Script:]"
+		logger.incoming.error '[Error running Script in Trigger', integration.name, ':]'
 		logger.incoming.error integration.scriptCompiled.replace(/^/gm, '  ')
 		logger.incoming.error "[Stack:]"
 		logger.incoming.error e.stack.replace(/^/gm, '  ')
@@ -227,16 +228,16 @@ ExecuteTriggerUrl = (url, trigger, message, room, tries=0) ->
 
 		if not result? or result.statusCode not in [200, 201, 202]
 			if error?
-				logger.outgoing.error error
+				logger.outgoing.error 'Error for trigger', trigger.name, 'to', url, error
 			if result?
-				logger.outgoing.error result
+				logger.outgoing.error 'Error for trigger', trigger.name, 'to', url, result
 
 			if result.statusCode is 410
 				RocketChat.models.Integrations.remove _id: trigger._id
 				return
 
 			if result.statusCode is 500
-				logger.outgoing.error 'Request Error [500]', url
+				logger.outgoing.error 'Error [500] for trigger', trigger.name, 'to', url
 				logger.outgoing.error result.content
 				return