|
@@ -54,8 +54,8 @@ func (b *BoolAuto) Set(s string) error {
|
|
|
}
|
|
|
|
|
|
func main() {
|
|
|
- addr := flag.String("addr", "localhost:9080", "http service address")
|
|
|
- querySocket := flag.String("socket", "", "Path to a unix domain socket for the HTTP server")
|
|
|
+ queryAddr := flag.String("addr", "", "http service address")
|
|
|
+ querySocket := flag.String("socket", "/tmp/circologd-query.sock", "Path to a unix domain socket for the HTTP server")
|
|
|
backlogLimit := flag.Int("n", -1, "Limit the backlog length, defaults to no limit (-1)")
|
|
|
var format formatter.Format
|
|
|
format = formatter.FormatSyslog
|
|
@@ -75,7 +75,7 @@ func main() {
|
|
|
signal.Notify(interrupt, os.Interrupt)
|
|
|
var d *websocket.Dialer
|
|
|
u := url.URL{Scheme: "ws",
|
|
|
- Host: *addr, // ignored in case of -socket; see the Dialer below
|
|
|
+ Host: *queryAddr, // ignored in case of -socket; see the Dialer below
|
|
|
Path: "/ws",
|
|
|
}
|
|
|
q := u.Query()
|
|
@@ -84,7 +84,7 @@ func main() {
|
|
|
q.Set("l", strconv.Itoa(*backlogLimit))
|
|
|
}
|
|
|
u.RawQuery = q.Encode()
|
|
|
- if *querySocket != "" {
|
|
|
+ if *queryAddr == "" {
|
|
|
d = &websocket.Dialer{
|
|
|
NetDial: func(network, addr string) (net.Conn, error) {
|
|
|
return net.Dial("unix", *querySocket)
|
|
@@ -95,7 +95,7 @@ func main() {
|
|
|
log.Printf("connecting to %s", *querySocket)
|
|
|
} else {
|
|
|
d = websocket.DefaultDialer
|
|
|
- log.Printf("connecting to %s", *addr)
|
|
|
+ log.Printf("connecting to %s", *queryAddr)
|
|
|
}
|
|
|
|
|
|
c, _, err := d.Dial(u.String(), nil)
|