Compare commits
No commits in common. "65c6aef5dcdbc255ee0c734950bb502e2ab2b565" and "c6cb674053a8ed5164950ff44a6cf4acdfc8dd18" have entirely different histories.
65c6aef5dc
...
c6cb674053
4 changed files with 8 additions and 51 deletions
|
|
@ -1,18 +1,14 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/fatih/color"
|
||||
"github.com/rosti-cz/server_lobby/server"
|
||||
)
|
||||
|
||||
func printDiscovery(discovery server.Discovery) {
|
||||
color.Yellow("Hostname:\n %s\n", discovery.Hostname)
|
||||
fmt.Printf("Hostname:\n %s\n", discovery.Hostname)
|
||||
|
||||
if len(discovery.Labels) > 0 {
|
||||
fmt.Printf("Labels:\n")
|
||||
|
|
@ -22,15 +18,6 @@ func printDiscovery(discovery server.Discovery) {
|
|||
}
|
||||
}
|
||||
|
||||
func colorLabel(label server.Label) string {
|
||||
parts := strings.Split(label.String(), ":")
|
||||
if len(parts) == 1 {
|
||||
return color.GreenString(parts[0])
|
||||
}
|
||||
|
||||
return color.GreenString(parts[0]) + ":" + color.MagentaString((strings.Join(parts[1:], ":")))
|
||||
}
|
||||
|
||||
func printDiscoveries(discoveries []server.Discovery) {
|
||||
maxHostnameWidth := 0
|
||||
for _, discovery := range discoveries {
|
||||
|
|
@ -41,29 +28,16 @@ func printDiscoveries(discoveries []server.Discovery) {
|
|||
|
||||
for _, discovery := range discoveries {
|
||||
if len(discovery.Labels) == 0 {
|
||||
// fmt.Println(discovery.Hostname)
|
||||
color.Yellow(discovery.Hostname)
|
||||
fmt.Println(discovery.Hostname)
|
||||
} else {
|
||||
hostname := fmt.Sprintf("%"+strconv.Itoa(maxHostnameWidth)+"s", discovery.Hostname)
|
||||
|
||||
fmt.Printf("%s %s\n", color.YellowString(hostname), colorLabel(discovery.Labels[0]))
|
||||
|
||||
fmt.Printf("%s %s\n", hostname, discovery.Labels[0].String())
|
||||
if len(discovery.Labels) > 1 {
|
||||
for _, label := range discovery.Labels[1:] {
|
||||
fmt.Printf("%"+strconv.Itoa(maxHostnameWidth+4)+"s%s\n", " ", colorLabel(label))
|
||||
fmt.Printf("%"+strconv.Itoa(maxHostnameWidth+4)+"s%s\n", " ", label)
|
||||
}
|
||||
}
|
||||
}
|
||||
fmt.Println()
|
||||
}
|
||||
}
|
||||
|
||||
func printJSON(data interface{}) {
|
||||
body, err := json.Marshal(data)
|
||||
if err != nil {
|
||||
fmt.Println("error occurred while formating the output into JSON:", err.Error())
|
||||
os.Exit(3)
|
||||
}
|
||||
|
||||
fmt.Println(string(body))
|
||||
}
|
||||
|
|
|
|||
10
ctl/main.go
10
ctl/main.go
|
|
@ -30,7 +30,6 @@ func main() {
|
|||
host := flag.String("host", "", "Hostname or IP address of lobby daemon")
|
||||
port := flag.Uint("port", 0, "Port of lobby daemon")
|
||||
token := flag.String("token", "", "Token needed to communicate lobby daemon, if empty auth is disabled")
|
||||
jsonOutput := flag.Bool("json", false, "set output to JSON, error will be still in plain text")
|
||||
|
||||
flag.Parse()
|
||||
|
||||
|
|
@ -104,22 +103,13 @@ func main() {
|
|||
}
|
||||
}
|
||||
|
||||
if *jsonOutput {
|
||||
printJSON(discoveries)
|
||||
} else {
|
||||
printDiscoveries(discoveries)
|
||||
}
|
||||
case "discovery":
|
||||
discovery, err := client.GetDiscovery()
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
}
|
||||
|
||||
if *jsonOutput {
|
||||
printJSON(discovery)
|
||||
} else {
|
||||
printDiscovery(discovery)
|
||||
}
|
||||
case "labels":
|
||||
if len(flag.Args()) < 3 {
|
||||
fmt.Println("ERROR: not enough arguments for labels command")
|
||||
|
|
|
|||
1
go.mod
1
go.mod
|
|
@ -4,7 +4,6 @@ go 1.16
|
|||
|
||||
require (
|
||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
|
||||
github.com/fatih/color v1.12.0
|
||||
github.com/go-resty/resty/v2 v2.6.0
|
||||
github.com/golang/protobuf v1.5.2 // indirect
|
||||
github.com/kelseyhightower/envconfig v1.4.0
|
||||
|
|
|
|||
10
go.sum
10
go.sum
|
|
@ -4,8 +4,6 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8
|
|||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
|
||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
|
||||
github.com/fatih/color v1.12.0 h1:mRhaKNwANqRgUBGKmnI5ZxEk7QXmjQeCcuYFMX2bfcc=
|
||||
github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
|
||||
github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
|
||||
github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
|
||||
github.com/go-resty/resty/v2 v2.6.0 h1:joIR5PNLM2EFqqESUjCMGXrWmXNHEU9CEiK813oKYS4=
|
||||
|
|
@ -32,13 +30,11 @@ github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8
|
|||
github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
|
||||
github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
|
||||
github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
|
||||
github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
|
||||
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
|
||||
github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
|
||||
github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
|
||||
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
|
||||
github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
|
||||
github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
|
||||
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
|
||||
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
|
||||
github.com/minio/highwayhash v1.0.1 h1:dZ6IIu8Z14VlC0VpfKofAhCy74wu/Qb5gcn52yWoz/0=
|
||||
github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
|
||||
github.com/nats-io/jwt v1.2.2 h1:w3GMTO969dFg+UOKTmmyuu7IGdusK+7Ytlt//OYH/uU=
|
||||
|
|
@ -86,8 +82,6 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
|
|||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
|
|
|
|||
Loading…
Reference in a new issue