diff options
| -rw-r--r-- | doAdminGui.go | 20 | ||||
| -rw-r--r-- | windowDroplets.go | 8 |
2 files changed, 16 insertions, 12 deletions
diff --git a/doAdminGui.go b/doAdminGui.go index 56cec06..8d71530 100644 --- a/doAdminGui.go +++ b/doAdminGui.go @@ -31,7 +31,7 @@ func (admin *adminT) refresh() { // display the uptime if data, err := postData(url+"/uptime", msg); err != nil { - log.Info("Error:", err) + log.Info("/uptime Error:", err) } else { log.Info("Response:", string(data)) admin.uptime.SetText(string(data)) @@ -39,25 +39,25 @@ func (admin *adminT) refresh() { // update the droplet list if data, err := postData(url+"/DropletsPB", msg); err != nil { - log.Info("Error:", err) + log.Info("/DropletsPB Error:", err) } else { - fmt.Println("Response len:", len(data)) + fmt.Println("DropletsPB Response len:", len(data)) admin.droplets = new(virtpb.Droplets) if err := admin.droplets.Unmarshal(data); err != nil { - fmt.Println("marshal failed", err) + fmt.Println("droplets marshal failed", err) return } fmt.Println("Droplet len=", admin.droplets.Len()) } // update the hypervisor list - if data, err := postData(url+"/HypervisorPB", msg); err != nil { + if data, err := postData(url+"/HypervisorsPB", msg); err != nil { log.Info("Error:", err) } else { - fmt.Println("Response len:", len(data)) + fmt.Println("HypervisorsPB Response len:", len(data)) admin.hypervisors = new(virtpb.Hypervisors) if err := admin.hypervisors.Unmarshal(data); err != nil { - fmt.Println("marshal failed", err) + fmt.Println("hypervisors marshal failed", err) return } fmt.Println("Hypervisors len=", admin.hypervisors.Len()) @@ -145,8 +145,10 @@ func (admin *adminT) doAdminGui() { grid.NewButton("refresh", func() { admin.refresh() }) - grid.NewButton("clean exit", func() { - okExit("admin close") + + grid.NewButton("test gui close", func() { + me.myGui.Close() + // okExit("admin close") }) // sit here forever refreshing the GUI diff --git a/windowDroplets.go b/windowDroplets.go index e94fec2..5474d57 100644 --- a/windowDroplets.go +++ b/windowDroplets.go @@ -175,14 +175,16 @@ func (dw *stdDropletTableWin) doActiveDroplets(pb *virtpb.Droplets) { return "ttyS0" }) serial.Custom = func(d *virtpb.Droplet) { - log.Printf("run %s: remmina spice://%s:%d\n", d.Hostname, argv.Server, d.SpicePort) + log.Printf("run %s: socat telnet somewhere %s:%d\n", d.Hostname, argv.Server, d.SpicePort) + log.Info("socat TCP-LISTEN:5000,reuseaddr,fork EXEC:\"virsh console myvm\"") + } fb := t.AddButtonFunc("fb0 console", func(p *virtpb.Droplet) string { return "remmina" }) fb.Custom = func(d *virtpb.Droplet) { - log.Printf("run %s: remmina spice://%s:%d\n", d.Hostname, argv.Server, d.SpicePort) + log.Printf("connect to %s on %s: remmina spice://%s:%d\n", d.Hostname, d.Current.Hypervisor, argv.Server, d.SpicePort) } t.AddHostname() @@ -194,7 +196,7 @@ func (dw *stdDropletTableWin) doActiveDroplets(pb *virtpb.Droplets) { t.AddSpicePort() t.AddTimeFunc("age", func(d *virtpb.Droplet) time.Time { age := d.Current.OnSince.AsTime() - log.Info("age", d.Hostname, virtpb.FormatDuration(time.Since(age))) + // log.Info("age", d.Hostname, virtpb.FormatDuration(time.Since(age))) return age }) t.AddStringFunc("State", func(d *virtpb.Droplet) string { |