Browse Source

update dist

master
zeus 4 years ago
parent
commit
f00f191717
  1. 8
      client/css/app.b5111772.css
  2. 9
      client/css/chunk-vendors.b9dd8f74.css
  3. BIN
      client/favicon.ico
  4. BIN
      client/fonts/themify.2c454669.eot
  5. BIN
      client/fonts/themify.a1ecc3b8.woff
  6. BIN
      client/fonts/themify.e23a7dca.ttf
  7. BIN
      client/img/docker.7b56657d.png
  8. BIN
      client/img/hybrid-1.852eef88.png
  9. BIN
      client/img/loading.f4404720.gif
  10. BIN
      client/img/penguinfledgling2.d4cb3ed7.png
  11. 362
      client/img/themify.9c8e96ec.svg
  12. BIN
      client/img/warning.f9cebb9b.png
  13. 1
      client/index.html
  14. 2
      client/js/app.04552242.js
  15. 1
      client/js/app.04552242.js.map
  16. 394
      client/js/chunk-vendors.f00828c9.js
  17. 1
      client/js/chunk-vendors.f00828c9.js.map
  18. 75
      llo/connect-new.js

8
client/css/app.b5111772.css

File diff suppressed because one or more lines are too long

9
client/css/chunk-vendors.b9dd8f74.css

File diff suppressed because one or more lines are too long

BIN
client/favicon.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
client/fonts/themify.2c454669.eot

Binary file not shown.

BIN
client/fonts/themify.a1ecc3b8.woff

Binary file not shown.

BIN
client/fonts/themify.e23a7dca.ttf

Binary file not shown.

BIN
client/img/docker.7b56657d.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
client/img/hybrid-1.852eef88.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
client/img/loading.f4404720.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

BIN
client/img/penguinfledgling2.d4cb3ed7.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

362
client/img/themify.9c8e96ec.svg

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 229 KiB

BIN
client/img/warning.f9cebb9b.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

1
client/index.html

@ -1 +0,0 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><title>Vue App</title><link href=/css/app.b5111772.css rel=preload as=style><link href=/css/chunk-vendors.b9dd8f74.css rel=preload as=style><link href=/js/app.04552242.js rel=preload as=script><link href=/js/chunk-vendors.f00828c9.js rel=preload as=script><link href=/css/chunk-vendors.b9dd8f74.css rel=stylesheet><link href=/css/app.b5111772.css rel=stylesheet></head><body><div id=app></div><script src=/js/chunk-vendors.f00828c9.js></script><script src=/js/app.04552242.js></script></body></html>

2
client/js/app.04552242.js

File diff suppressed because one or more lines are too long

1
client/js/app.04552242.js.map

File diff suppressed because one or more lines are too long

394
client/js/chunk-vendors.f00828c9.js

File diff suppressed because one or more lines are too long

1
client/js/chunk-vendors.f00828c9.js.map

File diff suppressed because one or more lines are too long

75
llo/connect-new.js

@ -533,7 +533,7 @@ app.get('/getwginterfaces', (req, res, next) => {
}); });
log.stderr.on('data', function (data) { log.stderr.on('data', function (data) {
console.log('error '+JSON.stringify(n)); //console.log('error '+JSON.stringify(n));
RES.code = req.query["action"] RES.code = req.query["action"]
RES.token = req.query["token"] RES.token = req.query["token"]
RES.error = true RES.error = true
@ -745,19 +745,24 @@ function mywgRemoveClosedConnection(){
//console.log(n.data); //console.log(n.data);
var interfaces = JSON.parse(n.data); var interfaces = JSON.parse(n.data);
var datalenth = interfaces.length var datalenth = interfaces.length
// interfaces found with connection=yes or no
for (var i=0 ; i < datalenth ; i++) for (var i=0 ; i < datalenth ; i++)
{ {
//console.log(i)
//console.log(interfaces)
var intconnection = interfaces[i].connection; var intconnection = interfaces[i].connection;
var resprivatekey = interfaces[i].ip; var resprivatekey = interfaces[i].ip;
var respublickey = interfaces[i].publickey; var respublickey = interfaces[i].publickey;
var bootstrapstackid = interfaces[i].stackid; var bootstrapstackid = interfaces[i].stackid;
if(intconnection == 'no'){
var nn = {} var nn = {}
nn.connection = interfaces[i].connection; nn.connection = interfaces[i].connection;
nn.AllowedIPs = interfaces[i].ip; nn.AllowedIPs = interfaces[i].ip;
nn.publickey = interfaces[i].publickey; nn.publickey = interfaces[i].publickey;
nn.bootstrapstackid = interfaces[i].stackid; nn.bootstrapstackid = interfaces[i].stackid;
console.log('no connection '+JSON.stringify(nn)); if(intconnection == 'no'){
//console.log('no connection '+JSON.stringify(nn));
var wgdown = `/bin/bash /config/${nn.bootstrapstackid}/ifdown_linux` var wgdown = `/bin/bash /config/${nn.bootstrapstackid}/ifdown_linux`
var showexecrm1 = `/bin/sh ./hybrid/connect/${bootstrapstackid}/swarmlabwgdown` var showexecrm1 = `/bin/sh ./hybrid/connect/${bootstrapstackid}/swarmlabwgdown`
var showexec1 = `docker exec swlabadminvenus /bin/bash -c "${wgdown}"; ${showexecrm1}` var showexec1 = `docker exec swlabadminvenus /bin/bash -c "${wgdown}"; ${showexecrm1}`
@ -768,11 +773,73 @@ function mywgRemoveClosedConnection(){
stdio: 'pipe' stdio: 'pipe'
}); });
log1.on('close', function (code) { log1.on('close', function (code) {
console.log('close1 '+JSON.stringify(code)); //console.log('close1 '+JSON.stringify(code));
var n = {} var n = {}
n.data = code n.data = code
io.emit('message_close', n); io.emit('message_close', n);
}); });
}else if(intconnection == 'yes'){
//connection is ok
// check if container is ok
var showexeccheck = `docker ps --format '{"Names":"{{ .Names }}", "Status":"{{.Status}}"}' | jq . -s `
exec(showexeccheck, (err, stdout, stderr) => {
if (err) {
console.error(`exec error: ${err}`);
return;
}
if (stdout) {
var string = stdout.toString()
var datajson = JSON.parse(string);
var search = `swarmlabwg-${bootstrapstackid}`
var extenderror = new RegExp(search);
var found = 'no';
for(var ia = 0; ia < datajson.length; ia++) {
var servicename = datajson[ia].Names
//console.log(JSON.stringify(search+' '+servicename))
if(extenderror.test(servicename)){
found = 'yes';
}
}
// container is down
// exec interface to down
if( found == 'no'){
//console.log(interfaces)
//console.log('no connection '+JSON.stringify(nn));
var wgdown = `/bin/bash /config/${nn.bootstrapstackid}/ifdown_linux`
var showexecrm1 = `/bin/sh ./hybrid/connect/${bootstrapstackid}/swarmlabwgdown`
//console.log('fount '+found + ' ' + search )
var showexec1 = `docker exec swlabadminvenus /bin/bash -c "${wgdown}"; ${showexecrm1}`
log1 = spawn(showexec1, {
shell: true,
cwd: mypath,
detached: false,
stdio: 'pipe'
});
log1.on('close', function (code) {
//console.log('close1 '+JSON.stringify(code));
var n = {}
n.data = code
io.emit('message_close', n);
});
}else{
console.log('fount '+found + ' ' + search )
}
}
})
} }
} }
}); });

Loading…
Cancel
Save