@@ -12,7 +12,7 @@ import (
1212)
1313
1414// this is the default port for talking to remote consul agents
15- const ConsulPort = 8500
15+ const defaultPort = 8500
1616
1717type verbosityLevel uint8
1818
@@ -25,10 +25,10 @@ func (v verbosityLevel) allows(other verbosityLevel) bool {
2525}
2626
2727const (
28- V0 verbosityLevel = iota
29- V1
30- V2
31- V3
28+ verbosityLevel0 verbosityLevel = iota
29+ verbosityLevel1
30+ verbosityLevel2
31+ verbosityLevel3
3232)
3333
3434func usage (code int ) {
@@ -42,18 +42,23 @@ func main() {
4242 serviceString := fs .String ("s" , "" , "Limit search by service address (regexp)" )
4343 tag := fs .String ("t" , "" , "Limit search by tag" )
4444 force := fs .Bool ("f" , false , "Force killing of all matches, including healthy services" )
45+ port := fs .Int ("port" , defaultPort , "Port to use when connecting to remote agents" )
46+ token := fs .String ("token" , "" , "Token to use when connecting to remote agents" )
4547 v1 := fs .Bool ("v" , false , "Verbose" )
4648 v2 := fs .Bool ("vv" , false , "Increased Verbosity" )
4749 v3 := fs .Bool ("vvv" , false , "Super Verbosity" )
48- fs .Parse (os .Args [1 :])
50+ if err := fs .Parse (os .Args [1 :]); err != nil {
51+ log .Printf ("Error parsing args: %s" , err )
52+ os .Exit (1 )
53+ }
4954
5055 var verbosity verbosityLevel
5156 if * v3 {
52- verbosity = V3
57+ verbosity = verbosityLevel3
5358 } else if * v2 {
54- verbosity = V2
59+ verbosity = verbosityLevel2
5560 } else if * v1 {
56- verbosity = V1
61+ verbosity = verbosityLevel1
5762 }
5863
5964 // show usage if there are not command line args
@@ -66,12 +71,12 @@ func main() {
6671 switch cmd {
6772 // define a couple synonyms to "hunt" as well
6873 case "hunt" , "find" , "search" :
69- serviceList := getList (* serviceString , * tag )
74+ serviceList := getList (* serviceString , * token , * tag )
7075 printList (serviceList , verbosity )
7176
7277 case "kill" :
73- serviceList := getList (* serviceString , * tag )
74- deregister (serviceList , * force )
78+ serviceList := getList (* serviceString , * token , * tag )
79+ deregister (serviceList , * port , * token , * force )
7580
7681 default :
7782 usage (1 )
@@ -105,7 +110,7 @@ func printList(serviceList []*api.ServiceEntry, v verbosityLevel) {
105110 }
106111
107112 switch true {
108- case v .allows (V3 ), v .allows (V2 ), v .allows (V1 ):
113+ case v .allows (verbosityLevel3 ), v .allows (verbosityLevel2 ), v .allows (verbosityLevel1 ):
109114 table .Append ([]string {
110115 se .Node .Node ,
111116 se .Service .ID ,
@@ -137,12 +142,12 @@ func printList(serviceList []*api.ServiceEntry, v verbosityLevel) {
137142}
138143
139144// kill those services that are failing in the passed list, or all if force is true
140- func deregister (serviceList []* api.ServiceEntry , force bool ) {
145+ func deregister (serviceList []* api.ServiceEntry , port int , token string , force bool ) {
141146 for _ , se := range serviceList {
142147 if ! isHealthy (se ) || force {
143- fullAddress := fmt .Sprintf ("%s:%d" , se .Node .Address , ConsulPort )
148+ fullAddress := fmt .Sprintf ("%s:%d" , se .Node .Address , port )
144149 fmt .Printf ("Deregistering %s: %s (%s)\n " , se .Service .Service , se .Service .ID , fullAddress )
145- client , err := getClient (fullAddress )
150+ client , err := getClient (fullAddress , token )
146151 if err != nil {
147152 log .Fatalf ("Unable to get consul client: %s\n " , err )
148153 }
0 commit comments