whatap 0.4.50 → 0.4.53

package/help.txt

@@ -1,5 +1,5 @@
 //whatap.conf를 다른 것으로 사용하고 싶을때 
-process.env.WHATAP_CONF = "wtap"; 
+process.env.WHATAP_CONF = "whtap"; 
 process.env.WHATAP_NAME = "NODE-{ip2}-{ip3}"
 
 //플러그인추가

package/lib/core/agent.js

@@ -7,8 +7,7 @@
 var os = require('os'),
     fs = require('fs'),
     path = require('path');
-const RequestLog = require('../requestlog');
-
+    
 var Interceptor      = require('./interceptor').Interceptor,
     HttpObserver     = require('../observers/http-observer').HttpObserver,
     NetObserver      = require('../observers/net-observer').NetObserver,
@@ -123,11 +122,7 @@ NodeAgent.prototype.init = function(cb) {
             return;
         }
         Logger.print('WHATAP-101', 'Finish initialize configuration...', false);
-        if(self._conf['reqlog_enabled'] === true ) {
-            Logger.print("WHATAP-REQLOG" , "ReqLog Init Start !!!! " , false);
-            RequestLog.initializer.process();
-        }
-        
+
         self._securityMaster.run( function (err) {
             if(err) {
                 Logger.printError('WHATAP-104', 'Failed to connect to whatap server', err, false);

package/lib/net/tcp-session.js

@@ -41,9 +41,9 @@ TcpSession.prototype.open = function(cb){
         if(cb) return cb(new Error('PCODE is not defined..'));
     }
     if(this.isOpen()) { 
-        ++reconnectCnt;
-        if(reconnectCnt === 3) {
-            this.close();
+        ++self.reconnectCnt;
+        if(self.reconnectCnt === 3) {
+            self.close();
         }
         return cb(new Error('Already connected..')); 
     }

package/lib/observers/http-observer.js

@@ -6,7 +6,7 @@
 
 const { reqlog_x_txid } = require('../conf/config-default');
 const controlHandler = require('../control/control-handler');
-const RequestLog = require('../requestlog');
+
 var TraceContextManager = require('../trace/trace-context-manager'),
     URLPatternDetector  = require('../trace/serviceurl-pattern-detector').Detector,
     DataTextAgent       = require('../data/datatext-agent'),
@@ -402,11 +402,7 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
 
         profile.oid = SecurityMaster.OID;
         profile.service = wtx;
-        if(conf.reqlog_enabled === true) { 
-            ctx.endTime = wtx.endTime;
-            ctx.elapsed = wtx.elapsed;
-            RequestLog.setRecord(ctx);
-        }
+
         //duplicated executed... so end() first 
         TraceContextManager.end(ctx._id);
         setTimeout(function () {

package/lib/util/process-seq.js

@@ -4,154 +4,156 @@
  * can be found in the LICENSE file.
  */
 
-var fs = require('fs'),
-	path = require('path');
-
+ var fs = require('fs'),
+ path = require('path'),
+ hahsUtil = require('../util/hashutil2'),
+ IPUtil      = require('../util/iputil');
 function isLiveProcess(pid) {
-  if(!pid || pid.length === 0) return true;
+if(!pid || pid.length === 0) return true;
 
-  try {
-    return process.kill(pid,0)
-  }
-  catch (e) {
-    return e.code === 'EPERM'
-  }
+try {
+ return process.kill(pid,0)
+}
+catch (e) {
+ return e.code === 'EPERM'
+}
 }
 
 function LockCompetition(key){
-	this.MAIN_KEY = key;
-	var Configuration = require('./../conf/configure');
-	var root = Configuration['app.root'];
-	var cwd = process.cwd();
-	if(root == undefined) {
-		root = cwd;
-	}
-	this.rootFolder = path.join(root,'SSwhatapSS').replace('SSwhatapSS','\.'+key);
-	this.LOCK_FILE = path.join(this.rootFolder,this.MAIN_KEY+'.lock');
-	this.initComplete = false;
+ this.MAIN_KEY = key;
+ var Configuration = require('./../conf/configure');
+ var root = Configuration['app.root'];
+ var cwd = process.cwd();
+ if(root == undefined) {
+	 root = cwd;
+ }
+ let gubun = hahsUtil.hash(IPUtil.getIp());
+ this.rootFolder = path.join(root,'SSwhatapSS').replace('SSwhatapSS','\.'+key + '/' + gubun);
+ this.LOCK_FILE = path.join(this.rootFolder,this.MAIN_KEY+'.lock');
+ this.initComplete = false;
 }
 
 LockCompetition.prototype.init = function(cb){
-	if(this.initComplete) {
-		if(cb) cb();
-	}
-	fs.mkdir( this.rootFolder, function(err){
-		if(!err || err.code === 'EEXIST'){
-			this.initComplete = true;
-			if(cb) cb();
-		}else{
-			return console.error(err);
-		}
-	});
+ if(this.initComplete) {
+	 if(cb) cb();
+ }
+ fs.mkdir( this.rootFolder, function(err){
+	 if(!err || err.code === 'EEXIST'){
+		 this.initComplete = true;
+		 if(cb) cb();
+	 }else{
+		 return console.error(err);
+	 }
+ });
 }
 
 LockCompetition.prototype.accessAuth = function(cb){
-	var self = this;		
-	self.init(function(){
-		var i = setInterval(function(){
-			self.createLockFile(path.join(self.LOCK_FILE), function(result){
-				if(result){
-					self.checkFileIndex(1, function(idx){
-						self.releaseLockFile( function(result){
-							if(result){
-								cb(idx);		
-								clearInterval(i);
-							}
-						})
-					})
-				}
-			})
-		},10)
-	});
+ var self = this;		
+ self.init(function(){
+	 var i = setInterval(function(){
+		 self.createLockFile(path.join(self.LOCK_FILE), function(result){
+			 if(result){
+				 self.checkFileIndex(1, function(idx){
+					 self.releaseLockFile( function(result){
+						 if(result){
+							 cb(idx);		
+							 clearInterval(i);
+						 }
+					 })
+				 })
+			 }
+		 })
+	 },10)
+ });
 }
 
 LockCompetition.prototype.readLockFile = function(cb){
-	fs.readFile( this.LOCK_FILE, 'utf-8', function(err,data){
-		if(cb) cb(err, data);
-	});
+ fs.readFile( this.LOCK_FILE, 'utf-8', function(err,data){
+	 if(cb) cb(err, data);
+ });
 }
 
 LockCompetition.prototype.createLockFile = function(file, cb){
-	var self = this;
-	self.readLockFile(function(err, data){
-		if(err){
-			fs.writeFile(file, process.pid + '', 'utf-8', function(err,data){
-				if(err){
-					if(cb) return cb(false);
-				}else{
-					self.readLockFile( function(err, data){
-						if(err && cb) return cb(false);
-						if(parseInt(data) === process.pid){
-							if(cb) return cb(true);
-						}else{
-							if(cb) return cb(false);
-						}
-					});
-				}
-			});
-		}else{
-			if(isLiveProcess(data)){
-				if(cb) return cb(false);
-			}else{
-				fs.unlink(self.LOCK_FILE, function(err){
-					if(err){
-						if(cb) return cb(false);
-					}else{
-						if(cb) return cb(true);
-					}
-				});
-			}
-		}
-	});
+ var self = this;
+ self.readLockFile(function(err, data){
+	 if(err){
+		 fs.writeFile(file, process.pid + '', 'utf-8', function(err,data){
+			 if(err){
+				 if(cb) return cb(false);
+			 }else{
+				 self.readLockFile( function(err, data){
+					 if(err && cb) return cb(false);
+					 if(parseInt(data) === process.pid){
+						 if(cb) return cb(true);
+					 }else{
+						 if(cb) return cb(false);
+					 }
+				 });
+			 }
+		 });
+	 }else{
+		 if(isLiveProcess(data)){
+			 if(cb) return cb(false);
+		 }else{
+			 fs.unlink(self.LOCK_FILE, function(err){
+				 if(err){
+					 if(cb) return cb(false);
+				 }else{
+					 if(cb) return cb(true);
+				 }
+			 });
+		 }
+	 }
+ });
 }
 
 LockCompetition.prototype.releaseLockFile = function(cb){
-	var self = this;
-	fs.readFile(self.LOCK_FILE, 'utf-8', function(err,data){
-		if(err && cb) return cb(err, data);
+ var self = this;
+ fs.readFile(self.LOCK_FILE, 'utf-8', function(err,data){
+	 if(err && cb) return cb(err, data);
 
-		if(parseInt(data) === process.pid){
-			fs.unlink(self.LOCK_FILE, function(err){
-				if(err){
-					if(cb) return cb(false);
-				}else{
-					if(cb) return cb(true);
-				}
-			});
-		}else{
-			if(cb) return cb(false);
-		}
-	});
+	 if(parseInt(data) === process.pid){
+		 fs.unlink(self.LOCK_FILE, function(err){
+			 if(err){
+				 if(cb) return cb(false);
+			 }else{
+				 if(cb) return cb(true);
+			 }
+		 });
+	 }else{
+		 if(cb) return cb(false);
+	 }
+ });
 }
 
 LockCompetition.prototype.checkFileIndex = function(idx,cb){
-	var self = this;
-	idx = idx || 1;
-	fs.readFile(path.join(self.rootFolder, self.MAIN_KEY+idx), 'utf-8', function(err,data){
-		if(err){
-			fs.writeFile(path.join(self.rootFolder, self.MAIN_KEY+idx), process.pid + '', 'utf-8', function(err){
-				if(err){
-					self.checkFileIndex(++idx,cb);					
-				}else{
-					if(cb) cb(idx);
-				}
-			});
-		}else{
-			if( isLiveProcess(data) ){
-				self.checkFileIndex(++idx,cb);
-			}else{
-				fs.writeFile(path.join(self.rootFolder, self.MAIN_KEY+idx), process.pid + '', 'utf-8', function(result){
-					if(err){
-						self.checkFileIndex(++idx,cb);
-					}else{
-						if(cb) cb(idx);
-					}
-				});
-			}
-		}
-	})
+ var self = this;
+ idx = idx || 1;
+ fs.readFile(path.join(self.rootFolder, self.MAIN_KEY+idx), 'utf-8', function(err,data){
+	 if(err){
+		 fs.writeFile(path.join(self.rootFolder, self.MAIN_KEY+idx), process.pid + '', 'utf-8', function(err){
+			 if(err){
+				 self.checkFileIndex(++idx,cb);					
+			 }else{
+				 if(cb) cb(idx);
+			 }
+		 });
+	 }else{
+		 if( isLiveProcess(data) ){
+			 self.checkFileIndex(++idx,cb);
+		 }else{
+			 fs.writeFile(path.join(self.rootFolder, self.MAIN_KEY+idx), process.pid + '', 'utf-8', function(result){
+				 if(err){
+					 self.checkFileIndex(++idx,cb);
+				 }else{
+					 if(cb) cb(idx);
+				 }
+			 });
+		 }
+	 }
+ })
 }
 
 module.exports = function(key){
-	return new LockCompetition(key);
+ return new LockCompetition(key);
 };

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.4.50",
-  "releaseDate": "20220711",
+  "version": "0.4.53",
+  "releaseDate": "20220714",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},

package/lib/requestlog.js

@@ -1,327 +0,0 @@
-/**
- * Copyright 2016 the WHATAP project authors. All rights reserved.
- * Use of this source code is governed by a license that
- * can be found in the LICENSE file.
- */
-var WHATAP_CONF  = 'reqlog';
-
-var conf     = require('./conf/configure'),
-    DateUtil = require('./util/dateutil'),
-    IPUtil   = require('./util/iputil'),
-    path     = require('path'),
-    fs       = require('fs'),
-    LOGGER = require('./logger');
-
-var PID=process.pid;
-
-var initializer = {
-    last : DateUtil.currentTime(),
-    lastDateUnit : DateUtil.getDateUnit(),
-    lastFileRotation : true,
-    reset : function () {
-        if(RequestLog.printWriter) RequestLog.printWriter.close();
-        RequestLog.logfile = null;
-        RequestLog.openFile();
-    },
-    process : function () {
-        conf  = require('./conf/configure');
-        var now = DateUtil.currentTime();
-        if(now > this.last + DateUtil.MILLIS_PER_HOUR) {
-            this.last = now;
-            RequestLog.clearOldLog();
-        }
-        if(this.lastFileRotation !== conf.reqlog_rotation_enabled
-            || this.lastDateUnit !== DateUtil.getDateUnit()
-            || (RequestLog.logfile !== null && fs.existsSync(RequestLog.logfile) == false)) {
-            try {
-                if(RequestLog.printWriter){
-                    RequestLog.printWriter.close();
-                }
-                RequestLog.logfile = null;
-                this.lastFileRotation = conf.reqlog_rotation_enabled;
-                this.lastDateUnit = DateUtil.getDateUnit();
-            } catch(e) {
-                console.log(e);
-            }
-        }
-        try {
-            RequestLog.openFile();
-        } catch(e) {
-            console.log(e);
-            return false;
-        }
-        return true;
-    }
-};
-
-var RequestLog = {
-    ONAME : null,
-    logfile : null,
-    lastLog : {},
-    printWriter : null,
-    setRecord : async function (ctx) {
-        try{
-            if(this.printWriter != null) {
-                this.buildRecord(ctx).then(e => {
-                    this.printWriter.write(e + '\n');
-                }).catch((err)=> {
-                    LOGGER.printError('[WHATAP-LOG]' ,'setRecord_1' , err , false);
-                });
-            } else {
-                this.openFile();
-            }
-        } catch (e){
-            LOGGER.printError('[WHATAP-LOG]' ,'setRecord_2' , err , false);
-        }
-    },
-    checkOk : function (id, sec) {
-        if(Object.keys(RequestLog.lastLog).length >= 1000) {
-            RequestLog.lastLog = {};
-        }
-
-        if(sec > 0) {
-            var last = RequestLog.lastLog[id];
-            if(last == null) {
-                last = 0;
-            }
-            var now = Date.now();
-            if(now < last + sec * 1000) {
-                return false;
-            }
-            RequestLog.lastLog[id] = now;
-        }
-        return true;
-    },
-    buildRecord : async function (ctx) {
-        var str = '';
-        let seperator = conf.reqlog_seperator;
-        str += "stime=" + ctx.start_time;
-		if (conf.reqlog_x_etime) {
-            str += seperator + "etime=" + ctx.endTime;
-		}
-		if (conf.reqlog_x_elapsed) {
-            str += seperator + "elapsed=" + ctx.elapsed;
-		}
-		if (conf.reqlog_x_url) {
-            str += seperator + "url=" + ctx.service_name;
-		}
-		if (conf.reqlog_x_httphost && ctx.http_host!=null) {
-            str += seperator + "httphost=" + ctx.http_host;
-		}
-		if (conf.reqlog_x_method) {
-            str += seperator + "method=" + ctx.http_method;
-		}
-		if (conf.reqlog_x_ip && ctx.remoteIp != 0) {
-            str += seperator + "ip=" + IPUtil.intToString(ctx.remoteIp);
-		}
-		if (conf.reqlog_x_status) {
-            str += seperator + "status=" + ctx.status;
-		}
-        /*
-		if (conf.reqlog_x_wcid && x.wclientId != 0) {
-            str += seperator + "wcid=" + x.wclientId;
-		}
-        */
-		if (conf.reqlog_x_login && ctx.login != null) {
-            str += seperator + "login=" + ctx.login;
-		}
-
-		if (conf.reqlog_x_error && ctx.error != null && ctx.statusMessage !== undefined) {
-            str += seperator + "errMsg=" + ctx.statusMessage;
-		}
-		if (conf.reqlog_x_useragent) {
-            str += seperator + "userAgent=" + ctx.userAgentString;
-		}
-		if (conf.reqlog_x_txid) {
-            str += seperator + "txid=" + ctx.txid;
-		}
-		if (ctx.custid != null) {
-			if (conf.reqlog_x_custid) {
-                str += seperator + "custid=" + ctx.custid;
-			} else if (conf.reqlog_x_gtid) {
-                str += seperator + "gtid=" + ctx.custid;
-			}
-		}
-		if (conf.reqlog_x_mtid && ctx.mtid != 0) {
-            str += seperator + "mtid=" + ctx.mtid;
-			if (conf.reqlog_x_mdepth) {
-                str += seperator + "mdepth=" + ctx.mdepth;
-			}
-		}
-        /*
-		if (conf.reqlog_x_dbc && x.dbc_time > 0) {
-            str += seperator + "dbcTime=" + x.dbc_time;
-		}
-        */
-		if (conf.reqlog_x_sql && ctx.sql_count > 0) {
-            str += seperator + "sqlCnt=" + ctx.sql_count;
-			str += seperator + "sqlTime=" + ctx.sql_time;
-		}
-		if (conf.reqlog_x_httpc && ctx.httpc_count > 0) {
-            str += seperator + "httpCallCnt=" + ctx.httpc_count;
-			str += seperator + "httpCallTime=" + ctx.httpc_time;
-		}
-		if (conf.reqlog_x_rs && ctx.rs_count > 0) {
-            str += seperator + "rsCnt=" + ctx.rs_count;
-			str += seperator + "rsTime=" + ctx.rs_time;
-		}
-		
-		return str;
-    },
-    openFile : function () {
-        if(conf.log_file_enabled === false ) { return; }
-        var log_prefix = WHATAP_CONF+"-";
-
-        var root = conf['app.root'];
-        if(root==null || root ==undefined){
-            console.log('[WHATAP]RequestLog Error - WHATAP ROOT DIR IS NULL!!!!!!!!!');
-            return;
-        }
-        var dir = path.join(root, 'logs');
-        if(fs.existsSync(dir) == false) {
-            fs.mkdirSync(dir);
-        }
-
-        if(conf.reqlog_rotation_enabled) {
-            var file = path.join(dir, log_prefix + DateUtil.yyyymmdd() + '.log');
-            this.logfile = file;
-            this.printWriter = fs.createWriteStream(file, {flags : 'a'});
-        } else {
-            var file = path.join(dir, 'reqlog.log');
-            this.logfile = file;
-            this.printWriter = fs.createWriteStream(file, {flags : 'a'});
-        }
-
-    },
-    clearOldLog : function () {
-        if(conf.reqlog_rotation_enabled === false || conf.reqlog_enabled === false) { return; }
-        if(conf.reqlog_keep_days <= 0) { return; }
-
-        var nowUnit = DateUtil.getDateUnit(),
-            root = conf['app.root'],
-            dir = path.join(root, 'logs'),
-            log_prefix = WHATAP_CONF+"-";
-
-        fs.readdir(dir, function (err, files) {
-
-            for(var i=0; i<files.length; i++) {
-                var stat = fs.statSync(path.join(dir, files[i]));
-                if(stat.isDirectory()) {
-                    return true;
-                }
-                var name = files[i];
-                if(name.indexOf(log_prefix) < 0) {
-                    return true;
-                }
-                var x = name.lastIndexOf('.');
-                if(x < 0) {
-                    return true;
-                }
-                var date = name.substr(log_prefix.length + 1, (x - log_prefix.length - 1));
-                if(date.length != 8) {
-                    return true;
-                }
-                var d = DateUtil.yyyymmdd(date);
-                var fileUnit = DateUtil.getDateUnit(d);
-                try {
-                    if (nowUnit - fileUnit > conflog_keep_days) {
-                        fs.unlinkSync(path.join(dir, files[i]));
-                    }
-                } catch (e) { }
-            }
-
-        });
-    },
-    read : function( file,  endpos,  length , callback) {
-
-		if ( file == null || length === 0)
-			return null;
-		if (file.startsWith(WHATAP_CONF) == false) return null;
-
-        var root = conf['app.root'];
-        if(root==null ){
-            return null;
-        }
-        var dir = path.join(root, 'logs');
-        var fileFullPath = path.join(dir, file);
-
-        if(fs.existsSync(fileFullPath) == false) {
-            return null;
-        }
-        const stats = fs.statSync(fileFullPath);
-
-        if (endpos < 0) {
-            endpos = stats.size;
-        }
-        
-		var start = Math.max(0, endpos - length);
-
-		if ( stats.size < start)
-            return null;
-            
-		var available = stats.size - start;
-        var readable = Math.min(available, length);
-        var next=-1;
-        var buffer = Buffer.alloc(readable);
-        fs.open(fileFullPath, 'r', function (err, fd) {
-            fs.read(fd, buffer, 0, buffer.length, start,function(e,l,b){
-                next = endpos + l;
-                if (next > stats.size) {
-                    next = -1;
-                }
-                callback(start, next,b.toString("utf8",0,l)) ;
-            });
-            fs.close(fd);
-        });
-       
-	},
-    getLogFiles : function () {
-        var MapValue = require('./value/map-value');
-        var log_prefix = WHATAP_CONF+"-";
-
-        var o = new MapValue();
-        if(conf.log_file_enabled === false ) { return o; }
-        var root = conf['app.root'];
-        if(root==null){
-            return o;
-        }
-        var dir = path.join(root, 'logs');
-        if(fs.existsSync(dir) === false) {
-            return o;
-        }
-        var agoOneMonthTime=DateUtil.getMonth(Date.now(), -1);
-
-        if(conf.reqlog_rotation_enabled) {
-            var files = fs.readdirSync(dir);
-            files.forEach(function (file) {
-                if (file.startsWith(log_prefix) == false) {
-                    return;
-                }
-                var x = file.lastIndexOf('.');
-                if (x < 0) {
-                    return;
-                }
-                var date = file.substring(log_prefix.length , x);
-                if (date.length != 8) {
-                    return;
-                }
-                if (DateUtil.yyyymmdd(date) < agoOneMonthTime) {
-                    return;
-                }
-                const stats = fs.statSync(dir + '/'+file);
-                if(stats){
-                    o.putLong(file, stats.size);
-                }
-            });
-        } else {
-            if (fs.existsSync(dir + "/reqlog.log")) {
-                const stats = fs.statSync(dir + "/reqlog.log");
-                o.putLong(file, stats.size);
-            }
-        }
-        return o;
-    },
-    initializer : initializer
-};
-
-module.exports = RequestLog;