merge conflict

pipedrive · Jun 15, 2015 · fc36904 · fc36904
2 parents fb935a7 + a183d6d
commit fc36904
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/status.js b/lib/status.js
@@ -221,7 +221,7 @@ Status.prototype.getConsulHealthcheck = function(options) {
 
 	var consulParams = {};
 	consulParams.interval = options && options.interval || '10s';
-	consulParams.notes = options && options.notes || 'Check service Kardia status using curl';
+	consulParams.notes = options && options.notes || this.config.name + ' Kardia health check';
 	consulParams.http = 'http://'+host+':'+this.config.port+'/health';
 
 	return consulParams;
@@ -422,4 +422,4 @@ Status.prototype.start = function() {
 	// dummy wrapper for catching subsequent start calls made by the underlying service using Kardia.
 }
 
-module.exports = Status;
+module.exports = Status;