From 50a14ac1d50944ca92d61efaadd41c7d8e0c34f3 Mon Sep 17 00:00:00 2001
From: Derek Collison <derek.collison@gmail.com>
Date: Sun, 20 Mar 2016 15:57:43 -1000
Subject: [PATCH] Modified debug and server id

---
 server/server.go   | 4 +++-
 server/util.go     | 2 +-
 sublist/sublist.go | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/server.go b/server/server.go
index 90c565c0..a8b8e5e8 100644
--- a/server/server.go
+++ b/server/server.go
@@ -204,6 +204,8 @@ func (s *Server) logPid() {
 // Start via a Go routine if needed.
 func (s *Server) Start() {
 	Noticef("Starting gnatsd version %s", VERSION)
+	Debugf("Go build version %s", s.info.GoVersion)
+
 	s.running = true
 
 	// Log the pid to a file
@@ -319,8 +321,8 @@ func (s *Server) AcceptLoop() {
 		Noticef("TLS required for client connections")
 	}
 
+	Debugf("server id is %s", s.info.ID)
 	Noticef("server is ready")
-	Debugf("server id - %s", s.info.ID)
 
 	// Setup state that can enable shutdown
 	s.mu.Lock()
diff --git a/server/util.go b/server/util.go
index af9b572c..c46c883f 100644
--- a/server/util.go
+++ b/server/util.go
@@ -10,7 +10,7 @@ import (
 
 // Use nuid.
 func genID() string {
-	return "NS:" + nuid.Next()
+	return nuid.Next()
 }
 
 // Ascii numbers 0-9
diff --git a/sublist/sublist.go b/sublist/sublist.go
index c66a1a09..6a2abb2d 100644
--- a/sublist/sublist.go
+++ b/sublist/sublist.go
@@ -209,7 +209,6 @@ func (s *Sublist) Match(subject []byte) []interface{} {
 		atomic.AddUint64(&s.stats.cacheHits, 1)
 		return r.([]interface{})
 	}
-
 	// Cache miss
 
 	// Process subject into tokens, this is performed