gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes

Browse Source 
Use include so that we can have logfile and remote sys log tested
on platforms other than Windows.
Added some missing defer server.Shutdown() statements.
This commit is contained in:
Ivan Kozlovic
2017-07-10 16:33:19 -06:00
parent ca1b3485cb
commit cae6b0b23a
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/configs/reload/reload.conf
View File

@@ -1,11 +1,12 @@
# Copyright 2017 Apcera Inc. All rights reserved.
include 'platform.conf'
# logging options
debug: true # enable on reload
trace: true # enable on reload
logtime: true # enable on reload
syslog: true # enable on reload
remote_syslog: "udp://localhost:514" # change on reload
pid_file: "/tmp/gnatsd.pid" # change on reload
max_control_line: 512 # change on reload

29
server/reload_test.go
View File

@@ -4,10 +4,12 @@ package server
import (
"fmt"
"io/ioutil"
"net"
"os"
"path/filepath"
"reflect"
"runtime"
"strings"
"testing"
"time"
@@ -33,6 +35,7 @@ func TestConfigReloadNoConfigFile(t *testing.T) {
func TestConfigReloadUnsupported(t *testing.T) {
server, opts, config := newServerWithSymlinkConfig(t, "tmp.conf", "./configs/reload/test.conf")
defer os.Remove(config)
defer server.Shutdown()
loaded := server.ConfigTime()
@@ -90,6 +93,7 @@ func TestConfigReloadUnsupported(t *testing.T) {
func TestConfigReloadInvalidConfig(t *testing.T) {
server, opts, config := newServerWithSymlinkConfig(t, "tmp.conf", "./configs/reload/test.conf")
defer os.Remove(config)
defer server.Shutdown()
loaded := server.ConfigTime()
@@ -145,8 +149,21 @@ func TestConfigReloadInvalidConfig(t *testing.T) {
// Ensure Reload returns nil and the config is changed on success.
func TestConfigReload(t *testing.T) {
var content []byte
if runtime.GOOS != "windows" {
content = []byte(`
remote_syslog: "udp://localhost:514" # change on reload
log_file: "/tmp/gnatsd-2.log" # change on reload
`)
}
platformConf := "platform.conf"
defer os.Remove(platformConf)
if err := ioutil.WriteFile(platformConf, content, 0666); err != nil {
t.Fatalf("Unable to write config file: %v", err)
}
server, opts, config := newServerWithSymlinkConfig(t, "tmp.conf", "./configs/reload/test.conf")
defer os.Remove(config)
defer server.Shutdown()
loaded := server.ConfigTime()
@@ -202,8 +219,13 @@ func TestConfigReload(t *testing.T) {
if !updated.Syslog {
t.Fatal("Expected Syslog to be true")
}
if updated.RemoteSyslog != "udp://localhost:514" {
t.Fatalf("RemoteSyslog is incorrect.\nexpected: udp://localhost:514\ngot: %s", updated.RemoteSyslog)
if runtime.GOOS != "windows" {
if updated.RemoteSyslog != "udp://localhost:514" {
t.Fatalf("RemoteSyslog is incorrect.\nexpected: udp://localhost:514\ngot: %s", updated.RemoteSyslog)
}
if updated.LogFile != "/tmp/gnatsd-2.log" {
t.Fatalf("LogFile is incorrect.\nexpected: /tmp/gnatsd-2.log\ngot: %s", updated.LogFile)
}
}
if updated.TLSConfig == nil {
t.Fatal("Expected TLSConfig to be non-nil")
@@ -1086,6 +1108,7 @@ func TestConfigReloadChangePermissions(t *testing.T) {
func TestConfigReloadClusterHostUnsupported(t *testing.T) {
server, _, config := newServerWithSymlinkConfig(t, "tmp.conf", "./configs/reload/srv_a_1.conf")
defer os.Remove(config)
defer server.Shutdown()
// Attempt to change cluster listen host.
if err := os.Remove(config); err != nil {
@@ -1106,6 +1129,7 @@ func TestConfigReloadClusterHostUnsupported(t *testing.T) {
func TestConfigReloadClusterPortUnsupported(t *testing.T) {
server, _, config := newServerWithSymlinkConfig(t, "tmp.conf", "./configs/reload/srv_a_1.conf")
defer os.Remove(config)
defer server.Shutdown()
// Attempt to change cluster listen port.
if err := os.Remove(config); err != nil {
@@ -1319,6 +1343,7 @@ func TestConfigReloadDisableClusterAuthorization(t *testing.T) {
func TestConfigReloadClusterRoutes(t *testing.T) {
srvb, srvbOpts, srvbConfig := runServerWithSymlinkConfig(t, "tmp_b.conf", "./configs/reload/srv_b_1.conf")
defer os.Remove(srvbConfig)
defer srvb.Shutdown()
srva, srvaOpts, srvaConfig := runServerWithSymlinkConfig(t, "tmp_a.conf", "./configs/reload/srv_a_1.conf")
defer os.Remove(srvaConfig)