diff --git a/files/mongo/venus-stats.js b/files/mongo/venus-stats.js index 4d3cd1d..d295e10 100644 --- a/files/mongo/venus-stats.js +++ b/files/mongo/venus-stats.js @@ -22,6 +22,14 @@ function getArgs () { } const args = getArgs(); + function mysearch(nameKey, myArray){ + for (var i=0; i < myArray.length; i++) { + if (myArray[i].name === nameKey) { + return myArray[i]; + } + } + } + const { spawn, exec, execSync } = require('child_process') //console.log(args) @@ -39,6 +47,10 @@ if (args["insert"] == 'yes'){ var dbNamePort = args["port"] var dbNameIP = args["ip"] var dbdate = args["json"] + var stackid = args["stackid"] + var stackinterface = args["stackinterface"] + var stackpeer = args["stackpeer"] + var devname = args["devname"] var showexec ='/usr/local/bin/wg-json'; try { @@ -47,7 +59,8 @@ if (args["insert"] == 'yes'){ NODE_ENV: "production", }, }); - var datajson = stdout.toString() + var datajsontmp = stdout.toString() + var datajson = mysearch(devname, datajsontmp); console.error('exec ' + JSON.stringify(datajson)); } catch (error) { var datajson = error.toString() @@ -57,6 +70,10 @@ if (args["insert"] == 'yes'){ var RESlog = new Object(); RESlog.date = dbdate RESlog.log = datajson + RESlog.stackid = stackid + RESlog.stackinterface = stackinterface + RESlog.stackpeer = stackpeer + RESlog.devname = devname var MongoClient = require('mongodb').MongoClient; diff --git a/llo/connect-new.js b/llo/connect-new.js index 8c41523..c5a6dae 100644 --- a/llo/connect-new.js +++ b/llo/connect-new.js @@ -305,11 +305,15 @@ docker run -d \ fs.writeFileSync(`./hybrid/connect/${res.bootstrapstackid}/swarmlabwg`, myExec); fs.writeFileSync(`./hybrid/connect/${res.bootstrapstackid}/swarmlabstatus`, 'wgstatusclient=off'); - const myExecLog = ` -#!/bin/sh +//stackid=2WpY5xabCndTNCvqYflUcORKTRDkf6e9 +//stackinterface=YBqJjwhL6a9OOcWBUdC9PjM8Gr7AOzuNX5g1247mVl8= +//stackname=swarmlabwg-2WpY5xabCndTNCvqYflUcORKTRDkf6e9 +//stackpeer=pl8Gf6HDMbKBHA/pQRPgCE7cdafoXVqpPo97I/tqlEQ= -date=`date '+%Y-%m-%d-%H:%M'` -node /usr/local/bin/venus-stats.js --insert=yes --port=${mongoserver.mongo_port} --ip='127.0.0.1' --user=swarmlab --password=${mongoserver.mongo_pass} --db=${mongoserver.mongo_db} --coll=${mongoserver.mongo_coll} --json=$date + const myExecLog = `#!/bin/sh + +date=\`date '+%Y-%m-%d-%H:%M'\` +node /usr/local/bin/venus-stats.js --insert=yes --port=${mongoserver.mongo_port} --ip='127.0.0.1' --user=swarmlab --password=${mongoserver.mongo_pass} --db=${mongoserver.mongo_db} --coll=${mongoserver.mongo_coll} --json=$date --stackid=${res.bootstrapstackid} --stackinterface=${res.privatekey} --stackpeer=${res.publickey} --devname=${DEV_NAME} ` fs.writeFileSync(`./hybrid/connect/${res.bootstrapstackid}/scripts/1/logs`, myExecLog);