Use hclog instead of stdlib log

Author: the-maldridge

cachefiller.go

@@ -2,11 +2,11 @@ package main
 
 import (
 	"context"
-	"log"
 	"strings"
 
 	"github.com/MiLk/nsscache-go/cache"
 	"github.com/MiLk/nsscache-go/source"
+	"github.com/hashicorp/go-hclog"
 
 	pb "github.com/netauth/protocol"
 	"github.com/netauth/netauth/pkg/netauth"
@@ -52,6 +52,8 @@ type NetAuthCacheFiller struct {
 	DefaultHome string
 
 	c *netauth.Client
+
+	l hclog.Logger
 }
 
 // NewCacheFiller returns an interface that can be used to fill caches
@@ -70,13 +72,15 @@ func NewCacheFiller(minuid, mingid int32, defshell, defhome string, shells []str
 		AllowedShells: shells,
 
 		DefaultHome: defhome,
+
+		l: hclog.L().Named("cachefiller"),
 	}
 
 	ctx := context.Background()
 
 	c, err := netauth.New()
 	if err != nil {
-		log.Println("Error during client initialization")
+		x.l.Error("Error during client initialization", "error", err)
 		return nil, err
 	}
 	c.SetServiceName("nsscache")
@@ -148,7 +152,10 @@ func (nc *NetAuthCacheFiller) findGroups(ctx context.Context) error {
 		if grps[i].GetNumber() < nc.MinGID {
 			// Group number is too low, continue without
 			// this one.
-			log.Printf("Ignoring group %s, GID is below cutoff (%d < %d)", grps[i].GetName(), grps[i].GetNumber(), nc.MinGID)
+			nc.l.Warn("Ignoring group, GID is below cutoff",
+				"group", grps[i].GetName(),
+				"limit", nc.MinGID,
+				"gid", grps[i].GetNumber())
 			continue
 		}
 		nc.groups[grps[i].GetName()] = grps[i]
@@ -173,13 +180,17 @@ func (nc *NetAuthCacheFiller) findEntities(ctx context.Context) error {
 		if ents[i].GetNumber() < nc.MinUID {
 			// The uidNumber was too low, continue without
 			// this one.
-			log.Printf("Ignoring entity %s, UID is below cutoff (%d < %d)", ents[i].GetID(), ents[i].GetNumber(), nc.MinUID)
+			nc.l.Warn("Ignoring entity, UID is below cutoff",
+				"entity", ents[i].GetID(),
+				"limit", nc.MinUID,
+				"uid", ents[i].GetNumber())
 			continue
 		}
 		if _, ok := nc.pgroups[ents[i].GetMeta().GetPrimaryGroup()]; !ok {
 			// The primary group was invalid, continue
 			// without this one.
-			log.Printf("Ignoring entity %s, Primary Group is invalid", ents[i].GetID())
+			nc.l.Warn("Ignoring entity, Primary Group is invalid",
+				"entity", ents[i].GetID())
 			continue
 		}
 		if nc.hasBadShell(ents[i].GetMeta().GetShell()) {

go.mod

@@ -4,6 +4,7 @@ go 1.12
 
 require (
 	github.com/MiLk/nsscache-go v1.1.0
+	github.com/hashicorp/go-hclog v0.9.2
 	github.com/netauth/netauth v0.3.1
 	github.com/netauth/protocol v0.0.0-20191124005711-167b58b61c72
 	github.com/spf13/pflag v1.0.3

main.go

@@ -3,10 +3,10 @@ package main
 import (
 	"fmt"
 	"io/ioutil"
-	"log"
 	"os"
 	"strings"
 
+	"github.com/hashicorp/go-hclog"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 
@@ -24,13 +24,15 @@ var (
 
 	outDir  = pflag.String("out", "/etc", "Output directory for cache files")
 	cfgfile = pflag.String("config", "", "Config file to use")
+
+	log hclog.Logger
 )
 
 func initialize() {
 	// Grab a listing of system shells and add them here
 	bytes, err := ioutil.ReadFile("/etc/shells")
 	if err != nil {
-		log.Printf("Error reading /etc/shells %s", err)
+		log.Error("Error reading /etc/shells %s", "error", err)
 		os.Exit(2)
 	}
 	shellString := string(bytes[:])
@@ -39,9 +41,9 @@ func initialize() {
 			systemShells = append(systemShells, s)
 		}
 	}
-	log.Println("The system will accept the following shells")
+	log.Info("The system will accept the following shells")
 	for _, s := range systemShells {
-		log.Printf("  %s", s)
+		log.Info(fmt.Sprintf("  %s", s))
 	}
 }
 
@@ -66,19 +68,21 @@ func main() {
 
 	filler, err := NewCacheFiller(int32(*minUID), int32(*minGID), *defShell, *defHomeDir, systemShells)
 	if err != nil {
-		log.Fatal("Error initializing Cache Filler: ", err)
+		log.Error("Error initializing Cache Filler: ", "error" ,err)
+		os.Exit(1)
 	}
 
 	cm := nsscache.NewCaches()
 	if err := cm.FillCaches(filler); err != nil {
-		log.Fatal("Unable to fill caches: ", err)
+		log.Error("Unable to fill caches: ", "error", err)
+		os.Exit(1)
 	}
 
 	err = cm.WriteFiles(&nsscache.WriteOptions{
 		Directory: *outDir,
 	})
 	if err != nil {
-		log.Fatal("Error writing updated caches: ", err)
+		log.Error("Error writing updated caches: ", "error", err)
 	}
-	log.Println("Caches Updated")
+	log.Info("Caches Updated")
 }