From e46b1872300cacb22f3c781288e751dce3cb016c Mon Sep 17 00:00:00 2001 From: Waldemar Quevedo Date: Wed, 17 Aug 2016 23:08:37 -0700 Subject: [PATCH] Enables using the same listen from server as was specified via `-a` in the cmd line for the monitoring server as well. --- server/opts.go | 4 ++++ server/opts_test.go | 30 +++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/server/opts.go b/server/opts.go index 80f8815d..c33c50bc 100644 --- a/server/opts.go +++ b/server/opts.go @@ -758,6 +758,10 @@ func processOptions(opts *Options) { if opts.Host == "" { opts.Host = DEFAULT_HOST } + if opts.HTTPHost == "" { + // Default to same bind from server if left undefined + opts.HTTPHost = opts.Host + } if opts.Port == 0 { opts.Port = DEFAULT_PORT } else if opts.Port == RANDOM_PORT { diff --git a/server/opts_test.go b/server/opts_test.go index 70228a7b..e41b043c 100644 --- a/server/opts_test.go +++ b/server/opts_test.go @@ -15,6 +15,7 @@ func TestDefaultOptions(t *testing.T) { Host: DEFAULT_HOST, Port: DEFAULT_PORT, MaxConn: DEFAULT_MAX_CONNECTIONS, + HTTPHost: DEFAULT_HOST, PingInterval: DEFAULT_PING_INTERVAL, MaxPingsOut: DEFAULT_PING_MAX_OUT, TLSTimeout: float64(TLS_TIMEOUT) / float64(time.Second), @@ -360,10 +361,13 @@ func TestListenConfig(t *testing.T) { // Normal clients host := "10.0.1.22" port := 4422 - + monHost := "127.0.0.1" if opts.Host != host { t.Fatalf("Received incorrect host %q, expected %q\n", opts.Host, host) } + if opts.HTTPHost != monHost { + t.Fatalf("Received incorrect host %q, expected %q\n", opts.HTTPHost, monHost) + } if opts.Port != port { t.Fatalf("Received incorrect port %v, expected %v\n", opts.Port, port) } @@ -409,6 +413,9 @@ func TestListenPortOnlyConfig(t *testing.T) { if opts.Host != DEFAULT_HOST { t.Fatalf("Received incorrect host %q, expected %q\n", opts.Host, DEFAULT_HOST) } + if opts.HTTPHost != DEFAULT_HOST { + t.Fatalf("Received incorrect host %q, expected %q\n", opts.Host, DEFAULT_HOST) + } if opts.Port != port { t.Fatalf("Received incorrect port %v, expected %v\n", opts.Port, port) } @@ -426,11 +433,32 @@ func TestListenPortWithColonConfig(t *testing.T) { if opts.Host != DEFAULT_HOST { t.Fatalf("Received incorrect host %q, expected %q\n", opts.Host, DEFAULT_HOST) } + if opts.HTTPHost != DEFAULT_HOST { + t.Fatalf("Received incorrect host %q, expected %q\n", opts.Host, DEFAULT_HOST) + } if opts.Port != port { t.Fatalf("Received incorrect port %v, expected %v\n", opts.Port, port) } } +func TestListenMonitoringDefault(t *testing.T) { + opts := &Options{ + Host: "10.0.1.22", + } + processOptions(opts) + + host := "10.0.1.22" + if opts.Host != host { + t.Fatalf("Received incorrect host %q, expected %q\n", opts.Host, host) + } + if opts.HTTPHost != host { + t.Fatalf("Received incorrect host %q, expected %q\n", opts.Host, host) + } + if opts.Port != DEFAULT_PORT { + t.Fatalf("Received incorrect port %v, expected %v\n", opts.Port, DEFAULT_PORT) + } +} + func TestMultipleUsersConfig(t *testing.T) { opts, err := ProcessConfigFile("./configs/multiple_users.conf") if err != nil {