From b3f097d5e456c57fe524f4ca627d79b90d5c4af8 Mon Sep 17 00:00:00 2001
From: Aaron Ogle <aaron@geekgonecrazy.com>
Date: Fri, 9 Jun 2017 13:17:25 -0500
Subject: [PATCH 1/3] Add instance id to response headers

---
 packages/rocketchat-lib/package.js          | 1 +
 packages/rocketchat-lib/server/lib/debug.js | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js
index b4e0168c266..143e60a71ef 100644
--- a/packages/rocketchat-lib/package.js
+++ b/packages/rocketchat-lib/package.js
@@ -17,6 +17,7 @@ Npm.depends({
 
 Package.onUse(function(api) {
 	api.use('rate-limit');
+	api.use('webapp')
 	api.use('session');
 	api.use('reactive-var');
 	api.use('reactive-dict');
diff --git a/packages/rocketchat-lib/server/lib/debug.js b/packages/rocketchat-lib/server/lib/debug.js
index a78481da3ba..40721565b6d 100644
--- a/packages/rocketchat-lib/server/lib/debug.js
+++ b/packages/rocketchat-lib/server/lib/debug.js
@@ -36,3 +36,9 @@ Meteor.publish = function(name, func) {
 		return func.apply(this, arguments);
 	});
 };
+
+WebApp.rawConnectHandlers.use(function(req, res, next) {
+	const setHeader = res.setHeader;
+	res.setHeader('X-Instance-ID', InstanceStatus.id());
+	return next();
+});

From cfa14324bc0110921af8ff7430fbf56117892882 Mon Sep 17 00:00:00 2001
From: Aaron Ogle <aaron@geekgonecrazy.com>
Date: Fri, 9 Jun 2017 13:19:55 -0500
Subject: [PATCH 2/3] remove un-needed var

---
 packages/rocketchat-lib/server/lib/debug.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/rocketchat-lib/server/lib/debug.js b/packages/rocketchat-lib/server/lib/debug.js
index 40721565b6d..59270fa0456 100644
--- a/packages/rocketchat-lib/server/lib/debug.js
+++ b/packages/rocketchat-lib/server/lib/debug.js
@@ -38,7 +38,6 @@ Meteor.publish = function(name, func) {
 };
 
 WebApp.rawConnectHandlers.use(function(req, res, next) {
-	const setHeader = res.setHeader;
 	res.setHeader('X-Instance-ID', InstanceStatus.id());
 	return next();
 });

From 3a3acf8539cf5fcf5f0509d9fb419e314d09fb49 Mon Sep 17 00:00:00 2001
From: Aaron Ogle <aaron@geekgonecrazy.com>
Date: Fri, 9 Jun 2017 13:38:55 -0500
Subject: [PATCH 3/3] added global for lint, and added missing ;

---
 packages/rocketchat-lib/package.js          | 2 +-
 packages/rocketchat-lib/server/lib/debug.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js
index 143e60a71ef..075f694d6ba 100644
--- a/packages/rocketchat-lib/package.js
+++ b/packages/rocketchat-lib/package.js
@@ -17,7 +17,7 @@ Npm.depends({
 
 Package.onUse(function(api) {
 	api.use('rate-limit');
-	api.use('webapp')
+	api.use('webapp');
 	api.use('session');
 	api.use('reactive-var');
 	api.use('reactive-dict');
diff --git a/packages/rocketchat-lib/server/lib/debug.js b/packages/rocketchat-lib/server/lib/debug.js
index 59270fa0456..b254b748fd7 100644
--- a/packages/rocketchat-lib/server/lib/debug.js
+++ b/packages/rocketchat-lib/server/lib/debug.js
@@ -1,3 +1,4 @@
+/* global InstanceStatus */
 const logger = new Logger('Meteor', {
 	methods: {
 		method: {