d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
70 lines
1.4 KiB
Go
70 lines
1.4 KiB
Go
package oonimkall
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/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}
|
|
}
|