core: unify logging interfacesv0.3.7

3 files changed, 29 insertions, 12 deletions

diff --git a/crypto/acme/autocert/autocert.go b/crypto/acme/autocert/autocert.go
index f99c36e..923b2fb 100644
--- a/crypto/acme/autocert/autocert.go
+++ b/crypto/acme/autocert/autocert.go
@@ -6,14 +6,11 @@ import (
         "fmt"
         "net"
 
+        "code.crute.us/mcrute/golib/log"
         "code.crute.us/mcrute/golib/service"
         "golang.org/x/net/idna"
 )
 
-type InfoReporter interface {
-        Info(...interface{})
-}
-
 type CertProvider interface {
         GetCertificate(*tls.ClientHelloInfo) (*tls.Certificate, error)
         Listener() net.Listener
@@ -23,7 +20,7 @@ type CertProvider interface {
 type PrimingCertProvider interface {
         CertProvider
         PrimeCache() error
-        PrimingReporter(InfoReporter) service.RunnerFunc
+        PrimingReporter(log.LeveledLogger) service.RunnerFunc
 }
 
 type ACMEHostList struct {
diff --git a/log/interface.go b/log/interface.go
new file mode 100644
index 0000000..5949070
--- /dev/null
+++ b/log/interface.go
@@ -0,0 +1,23 @@
+package log
+
+type BasicLogger interface {
+        Print(i ...interface{})
+        Printf(format string, args ...interface{})
+        Fatal(i ...interface{})
+        Fatalf(format string, args ...interface{})
+        Panic(i ...interface{})
+        Panicf(format string, args ...interface{})
+}
+
+type LeveledLogger interface {
+        BasicLogger
+
+        Debug(i ...interface{})
+        Debugf(format string, args ...interface{})
+        Info(i ...interface{})
+        Infof(format string, args ...interface{})
+        Warn(i ...interface{})
+        Warnf(format string, args ...interface{})
+        Error(i ...interface{})
+        Errorf(format string, args ...interface{})
+}
diff --git a/service/app_runner.go b/service/app_runner.go
index 61942b2..a960e70 100644
--- a/service/app_runner.go
+++ b/service/app_runner.go
@@ -7,18 +7,15 @@ import (
         "os/signal"
         "sync"
         "syscall"
-)
 
-type AppRunnerLogger interface {
-        Info(...interface{})
-        Error(...interface{})
-}
+        "code.crute.us/mcrute/golib/log"
+)
 
 type SyncRunnerFunc func() error
 type RunnerFunc func(context.Context, *sync.WaitGroup) error
 
 type AppRunner struct {
-        Logger         AppRunnerLogger
+        Logger         log.LeveledLogger
         initJobs       []SyncRunnerFunc // Jobs that run synchronously before other jobs
         jobs           []RunnerFunc     // Normal jobs
         backgroundJobs []RunnerFunc     // Jobs that can be disabled
@@ -29,7 +26,7 @@ type AppRunner struct {
         ctxCancel      context.CancelFunc
 }
 
-func NewAppRunner(ctx context.Context, logger AppRunnerLogger) *AppRunner {
+func NewAppRunner(ctx context.Context, logger log.LeveledLogger) *AppRunner {
         r := &AppRunner{
                 initJobs:       []SyncRunnerFunc{},
                 jobs:           []RunnerFunc{},