Commit 8e9aa2ab authored by Ahmad Nemati's avatar Ahmad Nemati

git pull

parent 8568606d
......@@ -2,6 +2,7 @@ const fs = require('fs')
let moment = require('moment-timezone')
let _ = require('lodash')
const uuid = require('uniqid')
var ps = require('ps-node');
let all = []
init()
......@@ -207,7 +208,13 @@ function printFile(name,data) {
return new Promise(function (resolve, reject) {
fs.writeFile('E:\\fail\\btc3\\'+name+'.csv', data, 'utf8', function (err) {
if (err) reject(err);
else resolve(data);
else ps.kill('1', function (err) {
if (err) {
throw new Error(err);
} else {
console.log('Process %s has been killed!', 1);
}
});
});
});
}
......
......@@ -5,7 +5,7 @@
"script": "./merge.js",
"merge_logs": true,
"log_date_format":"YY-MM-DD HH:mm",
"instances" : "8"
"instances" : "6"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment