Merge pull request #854 from nats-io/test

quick enablement of logging and tracing

test/new_routes_test.go

@@ -20,8 +20,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/nats-io/gnatsd/logger"
 	"github.com/nats-io/gnatsd/server"
-	nats "github.com/nats-io/go-nats"
+	"github.com/nats-io/go-nats"
 )
 
 func runNewRouteServer(t *testing.T) (*server.Server, *server.Options) {
@@ -1164,10 +1165,18 @@ func TestNewRouteReservedReply(t *testing.T) {
 }
 
 func TestNewRouteServiceImport(t *testing.T) {
+	// To quickly enable trace and debug logging
+	// doLog, doTrace, doDebug = true, true, true
 	srvA, srvB, optsA, optsB := runServers(t)
 	defer srvA.Shutdown()
 	defer srvB.Shutdown()
 
+	// Make so we can tell the two apart since in same PID.
+	if doLog {
+		srvA.SetLogger(logger.NewTestLogger("[SRV-A] - ", false), true, true)
+		srvB.SetLogger(logger.NewTestLogger("[SRV-B] - ", false), true, true)
+	}
+
 	// Do Accounts for the servers.
 	fooA, barA := registerAccounts(t, srvA)
 	fooB, barB := registerAccounts(t, srvB)
@@ -1176,6 +1185,8 @@ func TestNewRouteServiceImport(t *testing.T) {
 	addServiceExport("test.request", isPublic, fooA, fooB)
 
 	// Add import abilities to server B's bar account from foo.
+	// Meaning that when a user sends a request on foo.request from account bar,
+	// the request will be mapped to be received by the responder on account foo.
 	if err := barB.AddServiceImport(fooB, "foo.request", "test.request"); err != nil {
 		t.Fatalf("Error adding service import: %v", err)
 	}

test/test.go

@@ -48,16 +48,33 @@ func RunDefaultServer() *server.Server {
 	return RunServer(&DefaultTestOptions)
 }
 
+// To turn on server tracing and debugging and logging which are
+// normally suppressed.
+var (
+	doLog   = false
+	doTrace = false
+	doDebug = false
+)
+
 // RunServer starts a new Go routine based server
 func RunServer(opts *server.Options) *server.Server {
 	if opts == nil {
 		opts = &DefaultTestOptions
 	}
+	// Optionally override for individual debugging of tests
+	opts.NoLog = !doLog
+	opts.Trace = doTrace
+	opts.Debug = doDebug
+
 	s, err := server.NewServer(opts)
 	if err != nil || s == nil {
 		panic(fmt.Sprintf("No NATS Server object returned: %v", err))
 	}
 
+	if doLog {
+		s.ConfigureLogger()
+	}
+
 	// Run server in Go routine.
 	go s.Start()