Comparing version 0.0.25 to 0.0.26
@@ -94,7 +94,7 @@ /** | ||
Logger.print('WHATAP-100', 'Start initialize configuration...'); | ||
Logger.print('WHATAP-100', 'Start initialize configuration...', true); | ||
self._conf.init(this._userOpt , function(e) { | ||
if(e) return; | ||
Logger.print('WHATAP-101', 'Finish initialize configuration...'); | ||
Logger.print('WHATAP-101', 'Finish initialize configuration...', true); | ||
self._securityMaster.run( function (err) { | ||
@@ -145,3 +145,3 @@ if(err) { | ||
NodeAgent.prototype.connect = function (cb) { | ||
Logger.print("WHATAP-170", "[WhaTap Agent] now waiting for starting......") | ||
Logger.print("WHATAP-170", "[WhaTap Agent] now waiting for starting......", true) | ||
var self = this; | ||
@@ -158,3 +158,2 @@ self._tcpsession = new TcpSession(); | ||
Logger.printError("WHTAP-11", "TCP SESSION OPEN ERROR", err ,true); | ||
self.connect(cb) | ||
return; | ||
@@ -161,0 +160,0 @@ }; |
@@ -29,3 +29,3 @@ /** | ||
+ ",SECURE_KEY=" + this.SECURE_KEY.toString('hex') | ||
+ "]"); | ||
+ "]", true); | ||
this.getClusterId(cb); | ||
@@ -77,3 +77,3 @@ } else { | ||
lastOid = this.OID; | ||
require('../logger').print('WHATAP-168', "OID: " + this.OID + " ONAME: " + this.ONAME + " IP: " + IPUtil.toString(this.IP)); | ||
require('../logger').print('WHATAP-168', "OID: " + this.OID + " ONAME: " + this.ONAME + " IP: " + IPUtil.toString(this.IP), true); | ||
} | ||
@@ -80,0 +80,0 @@ }, |
@@ -36,3 +36,6 @@ /** | ||
if(secu.PCODE == null || secu.PCODE == 0) { cb(new Error('PCODE is not defined..')); } | ||
if(secu.PCODE == null || secu.PCODE == 0) { | ||
if(cb) | ||
cb(new Error('PCODE is not defined..')); | ||
} | ||
@@ -50,3 +53,3 @@ var host = conf.getWhatapServerHost(); | ||
Logger.print('WHATAP-180', "[Try to connect to] " + JSON.stringify(options)); | ||
Logger.print('WHATAP-180', "[Try to connect to] " + JSON.stringify(options), true); | ||
this.out = net.connect(options, function(err) { | ||
@@ -91,6 +94,8 @@ if(err) { | ||
this.out.on('end', function(){ | ||
Logger.print("WHATAP-183", "Disconnected from server"); | ||
Logger.print("WHATAP-183", "Disconnected from server, please check your license key..", true); | ||
self.out.destroy(); | ||
self.out = null; | ||
setTimeout(function() { | ||
self.open(); | ||
}, 5000); | ||
self.open(cb); | ||
}, 1000); | ||
}); | ||
@@ -97,0 +102,0 @@ }; |
@@ -28,2 +28,3 @@ /** | ||
TextTypes = require('../lang/text-types'), | ||
MessageStep = require('../step/message-step'), | ||
PluginLoaderManager = require('../plugin/plugin-loadermanager'), | ||
@@ -49,3 +50,5 @@ Long = require('long'); | ||
function initCtx(req, res) { | ||
/*url이 없으면 추적하지 않는다*/ | ||
if(req.url == null) { return null; } | ||
var ctx = TraceContextManager.start(); | ||
@@ -55,7 +58,10 @@ if(ctx == null) { return null; } | ||
req.__ctx_id__ = ctx._id; | ||
ctx.service_name = req.url; | ||
var url = req.url, | ||
index = url.indexOf('?'); | ||
if(index >= 0) { | ||
url = url.slice(0, index); | ||
} | ||
ctx.service_name = url; | ||
/*url이 없으면 추적하지 않는다*/ | ||
if(req.url == null) { return null; } | ||
try { | ||
@@ -70,5 +76,4 @@ if(conf.service_port_enabled == true && server.address()) { | ||
DataTextAgent.SERVICE.add(ctx.service_hash, ctx.service_name); | ||
ctx.isStaticContents = !(req.url.match(/.css|.js/) == null); | ||
if(req.headers['referer']) { | ||
@@ -169,2 +174,11 @@ ctx.referer = hashUtil.hashFromString(req.headers['referer']); | ||
if(conf.profile_http_header_enabled == true && req.headers) { | ||
var step = new MessageStep(); | ||
step.hash = hashUtil.hashFromString("HTTP-HEADERS"); | ||
step.start_time = ctx.getElapsedTime(); | ||
step.desc = JSON.stringify(req.headers); | ||
DataTextAgent.MESSAGE.add(step.hash, "HTTP-HEADERS"); | ||
ctx.profile.add(step); | ||
} | ||
try{ | ||
@@ -171,0 +185,0 @@ var profile = new ProfilePack(); |
{ | ||
"name": "whatap", | ||
"homepage": "http://www.whatap.io", | ||
"version": "0.0.25", | ||
"version": "0.0.26", | ||
"releaseDate": "20170404", | ||
@@ -6,0 +6,0 @@ "description": "Monitoring and Profiling Service", |
Unidentified License
License(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.
Found 2 instances in 1 package
Unidentified License
License(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.
Found 2 instances in 1 package
933396
13350