Skip to content

Commit

Permalink
add: remove monkey test mode
Browse files Browse the repository at this point in the history
  • Loading branch information
coufalja committed Jun 6, 2024
1 parent f3ecb9c commit 49a80d6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 130 deletions.
22 changes: 0 additions & 22 deletions raft/internal/invariants/nomonkey.go

This file was deleted.

66 changes: 0 additions & 66 deletions raft/internal/raft/monkey.go

This file was deleted.

25 changes: 0 additions & 25 deletions raft/internal/transport/monkey.go

This file was deleted.

23 changes: 6 additions & 17 deletions raft/logger/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ package logger

import (
"sync"

"github.com/jamf/regatta/raft/internal/invariants"
)

// LogLevel is the log level defined in dragonboat.
Expand Down Expand Up @@ -71,38 +69,29 @@ func SetLoggerFactory(f Factory) {
// GetLogger returns the logger for the specified package name. The most common
// use case for the returned logger is to set its log verbosity level.
func GetLogger(pkgName string) ILogger {
return getILogger(pkgName, false)
}

// GetMonkeyLogger returns a logger that only works in monkey test mode.
func GetMonkeyLogger(pkgName string) ILogger {
return getILogger(pkgName, true)
return getILogger(pkgName)
}

func getILogger(pkgName string, monkey bool) ILogger {
func getILogger(pkgName string) ILogger {
_loggers.mu.Lock()
defer _loggers.mu.Unlock()
l, ok := _loggers.loggers[pkgName]
if !ok {
l = &dragonboatLogger{pkgName: pkgName, monkeyLogger: monkey}
l = &dragonboatLogger{pkgName: pkgName}
_loggers.loggers[pkgName] = l
}
return l
}

type dragonboatLogger struct {
logger ILogger
pkgName string
mu sync.Mutex
monkeyLogger bool
logger ILogger
pkgName string
mu sync.Mutex
}

var _ ILogger = (*dragonboatLogger)(nil)

func (d *dragonboatLogger) get() ILogger {
if d.monkeyLogger && !invariants.MonkeyTest {
return _nullLogger
}
d.mu.Lock()
defer d.mu.Unlock()
if d.logger == nil {
Expand Down

0 comments on commit 49a80d6

Please sign in to comment.