astra/doggo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: replace logrus logger with logf

Browse source 
logf is a minimal logger with no dependencies. this commit should
bring down the binary size.
This commit is contained in:
Karan Sharma 2022-07-01 07:29:14 +05:30
parent 218eb0233a
commit 0f8084b13c
14 changed files with 102 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/api/api.go
View file

@ -8,7 +8,7 @@ import (
"github.com/mr-karan/doggo/internal/app"
"github.com/mr-karan/doggo/pkg/utils"
"github.com/sirupsen/logrus"
"github.com/mr-karan/logf"
"github.com/go-chi/chi"
"github.com/go-chi/chi/middleware"
@ -67,11 +67,11 @@ func main() {
IdleTimeout: ko.Duration("server.keepalive_timeout") * time.Millisecond,
}
logger.WithFields(logrus.Fields{
logger.WithFields(logf.Fields{
"address": srv.Addr,
}).Info("starting server")
if err := srv.ListenAndServe(); err != nil {
logger.Fatalf("couldn't start server: %v", err)
logger.WithError(err).Fatal("couldn't start server")
}
}

8
cmd/api/config.go
View file

@ -9,7 +9,7 @@ import (
"github.com/knadh/koanf/providers/env"
"github.com/knadh/koanf/providers/file"
"github.com/knadh/koanf/providers/posflag"
"github.com/sirupsen/logrus"
"github.com/mr-karan/logf"
flag "github.com/spf13/pflag"
)
@ -41,11 +41,11 @@ func initConfig() {
// Read the config files.
cFiles, _ := f.GetStringSlice("config")
for _, f := range cFiles {
logger.WithFields(logrus.Fields{
logger.WithFields(logf.Fields{
"file": f,
}).Info("reading config")
if err := ko.Load(file.Provider(f), toml.Parser()); err != nil {
logger.Fatalf("error reading config: %v", err)
logger.WithError(err).Fatal("error reading config")
}
}
// Load environment variables and merge into the loaded config.
@ -53,7 +53,7 @@ func initConfig() {
return strings.Replace(strings.ToLower(
strings.TrimPrefix(s, "DOGGO_API_")), "__", ".", -1)
}), nil); err != nil {
logger.Fatalf("error loading env config: %v", err)
logger.WithError(err).Fatal("error loading env config")
}
ko.Load(posflag.Provider(f, ".", ko), nil)

30
cmd/doggo/cli.go
View file

@ -10,7 +10,7 @@ import (
"github.com/mr-karan/doggo/internal/app"
"github.com/mr-karan/doggo/pkg/resolvers"
"github.com/mr-karan/doggo/pkg/utils"
"github.com/sirupsen/logrus"
"github.com/mr-karan/logf"
flag "github.com/spf13/pflag"
)
@ -61,34 +61,28 @@ func main() {
// Parse and Load Flags.
err := f.Parse(os.Args[1:])
if err != nil {
app.Logger.WithError(err).Error("error parsing flags")
app.Logger.Exit(2)
app.Logger.WithError(err).Fatal("error parsing flags")
}
if err = k.Load(posflag.Provider(f, ".", k), nil); err != nil {
app.Logger.WithError(err).Error("error loading flags")
f.Usage()
app.Logger.Exit(2)
app.Logger.WithError(err).Fatal("error loading flags")
}
// If version flag is set, output version and quit.
if k.Bool("version") {
fmt.Printf("%s - %s\n", buildVersion, buildDate)
app.Logger.Exit(0)
os.Exit(0)
}
// Set log level.
if k.Bool("debug") {
// Set logger level
app.Logger.SetLevel(logrus.DebugLevel)
} else {
app.Logger.SetLevel(logrus.InfoLevel)
app.Logger.SetLevel(logf.DebugLevel)
}
// Unmarshall flags to the app.
err = k.Unmarshal("", &app.QueryFlags)
if err != nil {
app.Logger.WithError(err).Error("error loading args")
app.Logger.Exit(2)
app.Logger.WithError(err).Fatal("error loading args")
}
// Load all `non-flag` arguments
@ -117,8 +111,7 @@ func main() {
// Load Nameservers.
err = app.LoadNameservers()
if err != nil {
app.Logger.WithError(err).Error("error loading nameservers")
app.Logger.Exit(2)
app.Logger.WithError(err).Fatal("error loading nameservers")
}
// Load Resolvers.
@ -129,14 +122,13 @@ func main() {
SearchList: app.ResolverOpts.SearchList,
Ndots: app.ResolverOpts.Ndots,
Timeout: app.QueryFlags.Timeout * time.Second,
Logger: app.Logger,
Logger: logger,
Strategy: app.QueryFlags.Strategy,
InsecureSkipVerify: app.QueryFlags.InsecureSkipVerify,
TLSHostname: app.QueryFlags.TLSHostname,
})
if err != nil {
app.Logger.WithError(err).Error("error loading resolver")
app.Logger.Exit(2)
app.Logger.WithError(err).Fatal("error loading resolver")
}
app.Resolvers = rslvrs
@ -144,7 +136,7 @@ func main() {
app.Logger.Debug("Starting doggo 🐶")
if len(app.QueryFlags.QNames) == 0 {
f.Usage()
app.Logger.Exit(0)
os.Exit(0)
}
// Resolve Queries.
@ -161,5 +153,5 @@ func main() {
app.Output(responses)
// Quitting.
app.Logger.Exit(0)
os.Exit(0)
}