273b70bacc
## Checklist - [x] I have read the [contribution guidelines](https://github.com/ooni/probe-cli/blob/master/CONTRIBUTING.md) - [x] reference issue for this pull request: https://github.com/ooni/probe/issues/1885 - [x] related ooni/spec pull request: N/A Location of the issue tracker: https://github.com/ooni/probe ## Description This PR contains a set of changes to move important interfaces and data types into the `./internal/model` package. The criteria for including an interface or data type in here is roughly that the type should be important and used by several packages. We are especially interested to move more interfaces here to increase modularity. An additional side effect is that, by reading this package, one should be able to understand more quickly how different parts of the codebase interact with each other. This is what I want to move in `internal/model`: - [x] most important interfaces from `internal/netxlite` - [x] everything that was previously part of `internal/engine/model` - [x] mocks from `internal/netxlite/mocks` should also be moved in here as a subpackage
70 lines
1.4 KiB
Go
70 lines
1.4 KiB
Go
package oonimkall
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
)
|
|
|
|
type loggerVerbose struct {
|
|
Logger
|
|
}
|
|
|
|
func (slv loggerVerbose) Debugf(format string, v ...interface{}) {
|
|
slv.Debug(fmt.Sprintf(format, v...))
|
|
}
|
|
func (slv loggerVerbose) Infof(format string, v ...interface{}) {
|
|
slv.Info(fmt.Sprintf(format, v...))
|
|
}
|
|
func (slv loggerVerbose) Warnf(format string, v ...interface{}) {
|
|
slv.Warn(fmt.Sprintf(format, v...))
|
|
}
|
|
|
|
type loggerNormal struct {
|
|
Logger
|
|
}
|
|
|
|
func (sln loggerNormal) Debugf(format string, v ...interface{}) {
|
|
// nothing
|
|
}
|
|
func (sln loggerNormal) Debug(msg string) {
|
|
// nothing
|
|
}
|
|
func (sln loggerNormal) Infof(format string, v ...interface{}) {
|
|
sln.Info(fmt.Sprintf(format, v...))
|
|
}
|
|
func (sln loggerNormal) Warnf(format string, v ...interface{}) {
|
|
sln.Warn(fmt.Sprintf(format, v...))
|
|
}
|
|
|
|
type loggerQuiet struct{}
|
|
|
|
func (loggerQuiet) Debugf(format string, v ...interface{}) {
|
|
// nothing
|
|
}
|
|
func (loggerQuiet) Debug(msg string) {
|
|
// nothing
|
|
}
|
|
func (loggerQuiet) Infof(format string, v ...interface{}) {
|
|
// nothing
|
|
}
|
|
func (loggerQuiet) Info(msg string) {
|
|
// nothing
|
|
}
|
|
func (loggerQuiet) Warnf(format string, v ...interface{}) {
|
|
// nothing
|
|
}
|
|
func (loggerQuiet) Warn(msg string) {
|
|
// nothing
|
|
}
|
|
|
|
func newLogger(logger Logger, verbose bool) model.Logger {
|
|
if logger == nil {
|
|
return loggerQuiet{}
|
|
}
|
|
if verbose {
|
|
return loggerVerbose{Logger: logger}
|
|
}
|
|
return loggerNormal{Logger: logger}
|
|
}
|