From 877c0f6f2eacb3cc08072ab6750128108488eb53 Mon Sep 17 00:00:00 2001 From: Ivan Daniluk Date: Sun, 3 May 2015 19:46:36 +0300 Subject: [PATCH] Import of termui fixed --- main.go | 13 +++++++++---- ui_multi.go | 2 +- ui_single.go | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index ff309e0..e68b4e3 100644 --- a/main.go +++ b/main.go @@ -6,15 +6,15 @@ import ( "sync" "time" - "github.com/divan/termui" + "github.com/gizak/termui" ) var ( interval = flag.Duration("i", 5*time.Second, "Polling interval") - portsArg = flag.String("ports", "1234", "Ports for accessing services expvars (comma-separated)") + portsArg = flag.String("ports", "", "Ports for accessing services expvars (comma-separated)") varsArg = flag.String("vars", "mem:memstats.Alloc,mem:memstats.Sys,mem:memstats.HeapAlloc,mem:memstats.HeapInuse,memstats.EnableGC,memstats.NumGC,duration:memstats.PauseTotalNs", "Vars to monitor (comma-separated)") dummy = flag.Bool("dummy", false, "Use dummy (console) output") - bind = flag.String("expvar", "1234", "Port to listen to be able monitor itself") + self = flag.Bool("self", false, "Monitor itself?") ) func main() { @@ -29,7 +29,12 @@ func main() { log.Fatal(err) } - go StartHttp(*bind) + if *self { + port, err := StartSelfMonitor() + if err == nil { + ports = append(ports, port) + } + } data := NewUIData(vars) for _, port := range ports { diff --git a/ui_multi.go b/ui_multi.go index d8dcd67..6049245 100644 --- a/ui_multi.go +++ b/ui_multi.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/divan/termui" + "github.com/gizak/termui" ) // TermUI is a termUI implementation of UI interface. diff --git a/ui_single.go b/ui_single.go index 91de197..21574c9 100644 --- a/ui_single.go +++ b/ui_single.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/divan/termui" + "github.com/gizak/termui" ) // TermUISingle is a termUI implementation of UI interface.