omit runc connector from darwin build

This commit is contained in:
Bradley Cicenas
2017-06-14 13:11:40 +00:00
parent e59a360b60
commit 617b1b2863
9 changed files with 41 additions and 29 deletions

24
main.go
View File

@@ -4,9 +4,9 @@ import (
"flag"
"fmt"
"os"
"strings"
"github.com/bcicen/ctop/config"
"github.com/bcicen/ctop/connector"
"github.com/bcicen/ctop/container"
"github.com/bcicen/ctop/cwidgets/compact"
"github.com/bcicen/ctop/logging"
@@ -41,8 +41,6 @@ func main() {
var connectorFlag = flag.String("connector", "docker", "container connector to use")
flag.Parse()
validConnector(*connectorFlag)
if *versionFlag {
fmt.Println(versionStr)
os.Exit(0)
@@ -88,7 +86,11 @@ func main() {
defer Shutdown()
// init grid, cursor, header
cursor = NewGridCursor(*connectorFlag)
conn, err := connector.ByName(*connectorFlag)
if err != nil {
panic(err)
}
cursor = &GridCursor{cSource: conn}
cGrid = compact.NewCompactGrid()
header = widgets.NewCTopHeader()
@@ -108,18 +110,6 @@ func Shutdown() {
}
}
func validConnector(s string) {
if _, ok := enabledConnectors[s]; !ok {
fmt.Printf("invalid connector type: %s\n", s)
var connectors []string
for k, _ := range enabledConnectors {
connectors = append(connectors, k)
}
fmt.Printf("connector must be one of: %s\n", strings.Join(connectors, ","))
os.Exit(1)
}
}
// ensure a given sort field is valid
func validSort(s string) {
if _, ok := container.Sorters[s]; !ok {
@@ -131,7 +121,7 @@ func validSort(s string) {
func panicExit() {
if r := recover(); r != nil {
Shutdown()
fmt.Printf("panic: %s\n", r)
fmt.Printf("error: %s\n", r)
os.Exit(1)
}
}