Merge 0e885d5 into 8a7ae2f

logger/logger.go

@@ -135,6 +135,13 @@ func (s *StanLogger) Tracef(format string, v ...interface{}) {
 	}, format, v...)
 }
 
+// Warnf logs a warning statement
+func (s *StanLogger) Warnf(format string, v ...interface{}) {
+	s.executeLogCall(func(logger Logger, format string, v ...interface{}) {
+		logger.Warnf(format, v...)
+	}, format, v...)
+}
+
 func (s *StanLogger) executeLogCall(f func(logger Logger, format string, v ...interface{}), format string, args ...interface{}) {
 	s.mu.Lock()
 	if s.log == nil {

logger/logger_test.go

@@ -56,6 +56,10 @@ func (d *dummyLogger) Fatalf(format string, args ...interface{}) {
 	d.msg = fmt.Sprintf(format, args...)
 }
 
+func (d *dummyLogger) Warnf(format string, args ...interface{}) {
+	d.msg = fmt.Sprintf(format, args...)
+}
+
 func (d *dummyLogger) Close() error {
 	return errors.New("dummy error")
 }

server/clustering.go

@@ -246,7 +246,7 @@ func (rl *raftLogger) Write(b []byte) (int, error) {
 		case 'I': // [INFO]
 			rl.log.Noticef("%s", b[levelStart+7:])
 		case 'W': // [WARN]
-			rl.log.Noticef("%s", b[levelStart+7:])
+			rl.log.Warnf("%s", b[levelStart+7:])
 		case 'E': // [ERR]
 			rl.log.Errorf("%s", b[levelStart+6:])
 		default:

server/server.go

@@ -2247,7 +2247,7 @@ func (s *StanServer) recoverOneSub(c *channel, recSub *spb.SubState, pendingAcks
 		// Do not recover a queue durable subscriber that still
 		// has ClientID but for which connection was closed (=>!added)
 		if !added && sub.isQueueDurableSubscriber() && !sub.isShadowQueueDurable() {
-			s.log.Noticef("WARN: Not recovering ghost durable queue subscriber: [%s]:[%s] subject=%s inbox=%s", sub.ClientID, sub.QGroup, sub.subject, sub.Inbox)
+			s.log.Warnf("Not recovering ghost durable queue subscriber: [%s]:[%s] subject=%s inbox=%s", sub.ClientID, sub.QGroup, sub.subject, sub.Inbox)
 			c.store.Subs.DeleteSub(sub.ID)
 			return nil
 		}

server/server_run_test.go

@@ -758,6 +758,18 @@ func (l *captureNoticesLogger) Noticef(format string, args ...interface{}) {
 	l.Unlock()
 }
 
+type captureWarnLogger struct {
+	dummyLogger
+	warnings []string
+}
+
+func (l *captureWarnLogger) Warnf(format string, args ...interface{}) {
+	l.Lock()
+	n := fmt.Sprintf(format, args...)
+	l.warnings = append(l.warnings, fmt.Sprintf("%s\n", n))
+	l.Unlock()
+}
+
 type captureFatalLogger struct {
 	dummyLogger
 	fatal string
@@ -808,7 +820,7 @@ func TestGhostDurableSubs(t *testing.T) {
 	s.Shutdown()
 
 	// Re-open
-	l := &captureNoticesLogger{}
+	l := &captureWarnLogger{}
 	opts.EnableLogging = true
 	opts.CustomLogger = l
 	s = runServerWithOpts(t, opts, nil)
@@ -817,20 +829,20 @@ func TestGhostDurableSubs(t *testing.T) {
 	check := func(expected bool) {
 		present := false
 		l.Lock()
-		for _, n := range l.notices {
+		for _, n := range l.warnings {
 			if strings.Contains(n, "ghost") {
 				present = true
 				break
 			}
 		}
-		notices := l.notices
+		warnings := l.warnings
 		// clear the logger notices
-		l.notices = nil
+		l.warnings = nil
 		l.Unlock()
 		if expected && !present {
-			stackFatalf(t, "No sign of ghost warning in the log:\n%v", notices)
+			stackFatalf(t, "No sign of ghost warning in the log:\n%v", warnings)
 		} else if !expected && present {
-			stackFatalf(t, "The warning should no longer be in the log:\n%v", notices)
+			stackFatalf(t, "The warning should no longer be in the log:\n%v", warnings)
 		}
 	}
 	s.Shutdown()

server/server_test.go

@@ -512,6 +512,7 @@ func (d *dummyLogger) Debugf(format string, args ...interface{})  { d.log(format
 func (d *dummyLogger) Tracef(format string, args ...interface{})  { d.log(format, args...) }
 func (d *dummyLogger) Errorf(format string, args ...interface{})  { d.log(format, args...) }
 func (d *dummyLogger) Fatalf(format string, args ...interface{})  { d.log(format, args...) }
+func (d *dummyLogger) Warnf(format string, args ...interface{})   { d.log(format, args...) }
 
 func TestVersionMatchesTag(t *testing.T) {
 	tag := os.Getenv("TRAVIS_TAG")

stores/common.go

@@ -24,7 +24,7 @@ import (
 
 // format string used to report that limit is reached when storing
 // messages.
-var droppingMsgsFmt = "WARNING: Reached limits for store %q (msgs=%v/%v bytes=%v/%v), " +
+var droppingMsgsFmt = "Reached limits for store %q (msgs=%v/%v bytes=%v/%v), " +
 	"dropping old messages to make room for new ones"
 
 // commonStore contains everything that is common to any type of store

stores/filestore.go

@@ -2870,7 +2870,7 @@ func (ms *FileMsgStore) enforceLimits(reportHitLimit, lockFile bool) error {
 		ms.removeFirstMsg(nil, lockFile)
 		if reportHitLimit && !ms.hitLimit {
 			ms.hitLimit = true
-			ms.log.Noticef(droppingMsgsFmt, ms.subject, ms.totalCount, ms.limits.MaxMsgs,
+			ms.log.Warnf(droppingMsgsFmt, ms.subject, ms.totalCount, ms.limits.MaxMsgs,
 				util.FriendlyBytes(int64(ms.totalBytes)), util.FriendlyBytes(ms.limits.MaxBytes))
 		}
 	}

stores/memstore.go

@@ -120,7 +120,7 @@ func (ms *MemoryMsgStore) Store(m *pb.MsgProto) (uint64, error) {
 			ms.removeFirstMsg()
 			if !ms.hitLimit {
 				ms.hitLimit = true
-				ms.log.Noticef(droppingMsgsFmt, ms.subject, ms.totalCount, ms.limits.MaxMsgs,
+				ms.log.Warnf(droppingMsgsFmt, ms.subject, ms.totalCount, ms.limits.MaxMsgs,
 					util.FriendlyBytes(int64(ms.totalBytes)), util.FriendlyBytes(ms.limits.MaxBytes))
 			}
 		}

stores/sqlstore.go

@@ -1416,7 +1416,7 @@ func (ms *SQLMsgStore) Store(m *pb.MsgProto) (uint64, error) {
 			}
 			if !ms.hitLimit {
 				ms.hitLimit = true
-				ms.log.Noticef(droppingMsgsFmt, ms.subject, ms.totalCount, ms.limits.MaxMsgs,
+				ms.log.Warnf(droppingMsgsFmt, ms.subject, ms.totalCount, ms.limits.MaxMsgs,
 					util.FriendlyBytes(int64(ms.totalBytes)), util.FriendlyBytes(ms.limits.MaxBytes))
 			}
 		}

stores/sqlstore_test.go

@@ -1302,6 +1302,7 @@ func (d *getExclusiveLockLogger) log(format string, args ...interface{}) {
 func (d *getExclusiveLockLogger) Noticef(format string, args ...interface{}) {}
 func (d *getExclusiveLockLogger) Debugf(format string, args ...interface{})  {}
 func (d *getExclusiveLockLogger) Tracef(format string, args ...interface{})  {}
+func (d *getExclusiveLockLogger) Warnf(format string, args ...interface{})   {}
 func (d *getExclusiveLockLogger) Errorf(format string, args ...interface{})  { d.log(format, args...) }
 func (d *getExclusiveLockLogger) Fatalf(format string, args ...interface{})  { d.log(format, args...) }