Replaces fmt.Sprintf in log messages with logger.[loglevel]f

to remove duplicate code.
knoxite · Oct 4, 2020 · 91b0ff2 · 91b0ff2
1 parent 6819043
commit 91b0ff2
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 45 deletions.
diff --git a/cmd/knoxite/cat.go b/cmd/knoxite/cat.go
@@ -42,16 +42,16 @@ func executeCat(snapshotID string, file string) error {
 	}
 	logger.Info("Opened repository")
 
-	logger.Info(fmt.Sprintf("Finding snapshot %s", snapshotID))
+	logger.Infof("Finding snapshot %s", snapshotID)
 	_, snapshot, err := repository.FindSnapshot(snapshotID)
 	if err != nil {
 		return err
 	}
-	logger.Info(fmt.Sprintf("Found snapshot %s", snapshot.Description))
+	logger.Infof("Found snapshot %s", snapshot.Description)
 
-	logger.Info(fmt.Sprintf("Reading snapshot %s", snapshotID))
+	logger.Infof("Reading snapshot %s", snapshotID)
 	if archive, ok := snapshot.Archives[file]; ok {
-		logger.Info(fmt.Sprintf("Found and read archive from location %s", archive.Path))
+		logger.Infof("Found and read archive from location %s", archive.Path)
 
 		logger.Info("Decoding archive data")
 		b, _, err := knoxite.DecodeArchiveData(repository, *archive)

diff --git a/cmd/knoxite/clone.go b/cmd/knoxite/clone.go
@@ -68,20 +68,20 @@ func executeClone(snapshotID string, args []string, opts StoreOptions) error {
 	}
 	logger.Info("Opened repository")
 
-	logger.Info(fmt.Sprintf("Finding snapshot %s", snapshotID))
+	logger.Infof("Finding snapshot %s", snapshotID)
 	volume, s, err := repository.FindSnapshot(snapshotID)
 	if err != nil {
 		return err
 	}
-	logger.Info(fmt.Sprintf("Found snapshot %s", s.Description))
+	logger.Infof("Found snapshot %s", s.Description)
 
 	logger.Info("Cloning snapshot")
 	snapshot, err := s.Clone()
 	if err != nil {
 		return err
 	}
-	logger.Info(fmt.Sprintf("Cloned snapshot. New snapshot: ID: %s, "+
-		"Description: %s.", snapshot.ID, snapshot.Description))
+	logger.Infof("Cloned snapshot. New snapshot: ID: %s, "+
+		"Description: %s.", snapshot.ID, snapshot.Description)
 
 	logger.Info("Opening chunk index")
 	chunkIndex, err := knoxite.OpenChunkIndex(&repository)
@@ -93,12 +93,12 @@ func executeClone(snapshotID string, args []string, opts StoreOptions) error {
 	lock()
 	logger.Info("Released shutdown lock")
 
-	logger.Info(fmt.Sprintf("Storing cloned snapshot %s", snapshot.ID))
+	logger.Infof("Storing cloned snapshot %s", snapshot.ID)
 	err = store(&repository, &chunkIndex, snapshot, targets, opts)
 	if err != nil {
 		return err
 	}
-	logger.Info(fmt.Sprintf("Stored clone %s of snapshot %s", snapshot.ID, s.ID))
+	logger.Infof("Stored clone %s of snapshot %s", snapshot.ID, s.ID)
 
 	// acquire another shutdown lock. we don't want these next calls to be interrupted
 	logger.Info("Acquiring shutdown lock")
@@ -111,14 +111,14 @@ func executeClone(snapshotID string, args []string, opts StoreOptions) error {
 	defer lock()
 	defer logger.Info("Shutdown lock released")
 
-	logger.Info(fmt.Sprintf("Saving snapshot %s", snapshot.ID))
+	logger.Infof("Saving snapshot %s", snapshot.ID)
 	err = snapshot.Save(&repository)
 	if err != nil {
 		return err
 	}
 	logger.Info("Saved snapshot")
 
-	logger.Info(fmt.Sprintf("Adding snapshot to volume %s", volume.ID))
+	logger.Infof("Adding snapshot to volume %s", volume.ID)
 	err = volume.AddSnapshot(snapshot.ID)
 	if err != nil {
 		return err

diff --git a/cmd/knoxite/config.go b/cmd/knoxite/config.go
@@ -106,7 +106,7 @@ func executeConfigInit() error {
 	if err != nil {
 		return err
 	}
-	logger.Info(fmt.Sprintf("Wrote configuration file to: %s", cfg.URL().Path))
+	logger.Infof("Wrote configuration file to: %s", cfg.URL().Path)
 	return nil
 }
 
@@ -143,7 +143,7 @@ func executeConfigSet(option string, values []string) error {
 	if !ok {
 		return fmt.Errorf("No alias with name %s found", parts[0])
 	}
-	logger.Info(fmt.Sprintf("Found repository configuration for alias %s", parts[0]))
+	logger.Infof("Found repository configuration for alias %s", parts[0])
 
 	logger.Info("Setting config options according to flags")
 	opt := strings.ToLower(parts[1])

diff --git a/cmd/knoxite/ls.go b/cmd/knoxite/ls.go
@@ -63,15 +63,15 @@ func executeLs(snapshotID string) error {
 	for _, archive := range snapshot.Archives {
 		username := strconv.FormatInt(int64(archive.UID), 10)
 
-		logger.Info(fmt.Sprintf("Looking up OS username with archive's UID %d", archive.UID))
+		logger.Infof("Looking up OS username with archive's UID %d", archive.UID)
 		u, err := user.LookupId(username)
 		if err == nil {
-			logger.Info(fmt.Sprintf("Username found: %s", u.Username))
+			logger.Infof("Username found: %s", u.Username)
 			username = u.Username
 		} else {
 			logger.Warn("Looking up username failed. Using default value.")
 		}
-		
+
 		groupname := strconv.FormatInt(int64(archive.GID), 10)
 		tab.AppendRow([]interface{}{
 			archive.Mode,

diff --git a/cmd/knoxite/mount.go b/cmd/knoxite/mount.go
@@ -65,7 +65,7 @@ func executeMount(snapshotID, mountpoint string) error {
 	if _, err := os.Stat(mountpoint); os.IsNotExist(err) {
 		fmt.Printf("Mountpoint %s doesn't exist, creating it\n", mountpoint)
 
-		logger.Warn(fmt.Sprintf("Mountpoint %s doesn't exist, creating it", mountpoint))
+		logger.Warnf("Mountpoint %s doesn't exist, creating it", mountpoint)
 		err = os.Mkdir(mountpoint, os.ModeDir|0700)
 		if err != nil {
 			return err
@@ -160,7 +160,7 @@ func node(name string, arc knoxite.Archive, repository *knoxite.Repository) *Nod
 		v, ok := item.Items[s]
 		if !ok {
 			path := filepath.Join(l[:k+1]...)
-			logger.Debug(fmt.Sprintf("Adding %s to tree", path))
+			logger.Debugf("Adding %s to tree", path)
 			fmt.Println("Adding to tree:", path)
 			if name != path {
 				// We stored an absolute path and need to fake the parent
@@ -199,7 +199,7 @@ func updateIndex(repository *knoxite.Repository, snapshot *knoxite.Snapshot) {
 			// Strip the leading slash for mounting
 			path = path[1:]
 		}
-		logger.Debug(fmt.Sprintf("Adding %s to index", path))
+		logger.Debugf("Adding %s to index", path)
 		fmt.Println("Adding to index:", path)
 		node(path, *arc, repository)
 	}
@@ -258,7 +258,7 @@ func (node *Node) ReadDirAll(_ context.Context) ([]fuse.Dirent, error) {
 // Open opens a file.
 func (node *Node) Open(_ context.Context, req *fuse.OpenRequest, resp *fuse.OpenResponse) (fs.Handle, error) {
 	if !req.Flags.IsReadOnly() {
-		logger.Info(fmt.Sprintf("Opening file from %s", node.Archive.Path))
+		logger.Infof("Opening file from %s", node.Archive.Path)
 		err := fuse.Errno(syscall.EACCES)
 		if err != 0 {
 			return nil, err
@@ -271,7 +271,7 @@ func (node *Node) Open(_ context.Context, req *fuse.OpenRequest, resp *fuse.Open
 
 // Read reads from a file.
 func (node *Node) Read(_ context.Context, req *fuse.ReadRequest, resp *fuse.ReadResponse) error {
-	logger.Info(fmt.Sprintf("Reading archive %s", node.Archive.Path))
+	logger.Infof("Reading archive %s", node.Archive.Path)
 	d, err := knoxite.ReadArchive(*node.Repository, node.Archive, int(req.Offset), req.Size)
 	if err != nil {
 		if err != io.EOF {

diff --git a/cmd/knoxite/repository.go b/cmd/knoxite/repository.go
@@ -160,7 +160,7 @@ func executeRepoAdd(url string) error {
 	if err != nil {
 		return err
 	}
-	logger.Info(fmt.Sprintf("Found backend with protocols: %s", backend.Protocols()))
+	logger.Infof("Found backend with protocols: %s", backend.Protocols())
 
 	logger.Info("Initializing repository")
 	err = backend.InitRepository()

diff --git a/cmd/knoxite/restore.go b/cmd/knoxite/restore.go
@@ -83,14 +83,14 @@ func executeRestore(snapshotID, target string, opts RestoreOptions) error {
 	}
 	logger.Info("Opened repository")
 
-	logger.Info(fmt.Sprintf("Finding snapshot %s", snapshotID))
+	logger.Infof("Finding snapshot %s", snapshotID)
 	_, snapshot, err := repository.FindSnapshot(snapshotID)
 	if err != nil {
 		return err
 	}
-	logger.Info(fmt.Sprintf("Found snapshot %s", snapshot.Description))
+	logger.Infof("Found snapshot %s", snapshot.Description)
 
-	logger.Info(fmt.Sprintf("Decoding snapshot %s", snapshot.ID))
+	logger.Infof("Decoding snapshot %s", snapshot.ID)
 	progress, err := knoxite.DecodeSnapshot(repository, snapshot, target, opts.Excludes, opts.Pedantic)
 	if err != nil {
 		return err

diff --git a/cmd/knoxite/snapshot.go b/cmd/knoxite/snapshot.go
@@ -68,21 +68,21 @@ func executeSnapshotRemove(snapshotID string) error {
 	}
 	logger.Info("Opened chunk index")
 
-	logger.Info(fmt.Sprintf("Finding snapshot %s", snapshotID))
+	logger.Infof("Finding snapshot %s", snapshotID)
 	volume, snapshot, err := repository.FindSnapshot(snapshotID)
 	if err != nil {
 		return err
 	}
 	logger.Info("Found snapshot")
 
-	logger.Info(fmt.Sprintf("Removing snapshot %s. Description: %s. Date: %s", snapshotID, snapshot.Description, snapshot.Date))
+	logger.Infof("Removing snapshot %s. Description: %s. Date: %s", snapshotID, snapshot.Description, snapshot.Date)
 	err = volume.RemoveSnapshot(snapshot.ID)
 	if err != nil {
 		return err
 	}
 	logger.Info("Removed snapshot")
 
-	logger.Info(fmt.Sprintf("Removing snapshot %s from chunk index", snapshotID))
+	logger.Infof("Removing snapshot %s from chunk index", snapshotID)
 	chunkIndex.RemoveSnapshot(snapshot.ID)
 
 	logger.Info("Saving chunk index for repository")
@@ -112,7 +112,7 @@ func executeSnapshotList(volID string) error {
 	}
 	logger.Info("Opened repository")
 
-	logger.Info(fmt.Sprintf("Finding volume %s", volID))
+	logger.Infof("Finding volume %s", volID)
 	volume, err := repository.FindVolume(volID)
 	if err != nil {
 		return err
@@ -127,7 +127,7 @@ func executeSnapshotList(volID string) error {
 
 	logger.Debug("Iterating over snapshots to print details")
 	for _, snapshotID := range volume.Snapshots {
-		logger.Debug(fmt.Sprintf("Loading snapshot %s", snapshotID))
+		logger.Debugf("Loading snapshot %s", snapshotID)
 		snapshot, err := volume.LoadSnapshot(snapshotID, &repository)
 		if err != nil {
 			return err

diff --git a/cmd/knoxite/store.go b/cmd/knoxite/store.go
@@ -108,7 +108,7 @@ func store(repository *knoxite.Repository, chunkIndex *knoxite.ChunkIndex, snaps
 	if err != nil {
 		return err
 	}
-	logger.Info(fmt.Sprintf("Got rooted path: %s", wd))
+	logger.Infof("Got rooted path: %s", wd)
 
 	if len(repository.BackendManager().Backends)-int(opts.FailureTolerance) <= 0 {
 		return ErrRedundancyAmount
@@ -238,14 +238,14 @@ func executeStore(volumeID string, args []string, opts StoreOptions) error {
 	}
 	logger.Info("Opened repository")
 
-	logger.Info(fmt.Sprintf("Finding volume %s", volumeID))
+	logger.Infof("Finding volume %s", volumeID)
 	volume, err := repository.FindVolume(volumeID)
 	if err != nil {
 		return err
 	}
 	logger.Info("Found volume")
 
-	logger.Info(fmt.Sprintf("Creating new snapshot: %s", opts.Description))
+	logger.Infof("Creating new snapshot: %s", opts.Description)
 	snapshot, err := knoxite.NewSnapshot(opts.Description)
 	if err != nil {
 		return err
@@ -263,7 +263,7 @@ func executeStore(volumeID string, args []string, opts StoreOptions) error {
 	lock()
 	logger.Info("Shutdown lock released")
 
-	logger.Info(fmt.Sprintf("Storing snapshot %s", snapshot.ID))
+	logger.Infof("Storing snapshot %s", snapshot.ID)
 	err = store(&repository, &chunkIndex, snapshot, targets, opts)
 	if err != nil {
 		return err
@@ -286,7 +286,7 @@ func executeStore(volumeID string, args []string, opts StoreOptions) error {
 	}
 	logger.Info("Saved snapshot")
 
-	logger.Info(fmt.Sprintf("Adding snapshot to volume %s", volume.ID))
+	logger.Infof("Adding snapshot to volume %s", volume.ID)
 	err = volume.AddSnapshot(snapshot.ID)
 	if err != nil {
 		return err

diff --git a/cmd/knoxite/verify.go b/cmd/knoxite/verify.go
@@ -78,7 +78,7 @@ func executeVerifyVolume(volumeId string, opts VerifyOptions) error {
 	}
 	logger.Info("Opened repository")
 
-	logger.Info(fmt.Sprintf("Verifying volume %s and get knoxite progress", volumeId))
+	logger.Infof("Verifying volume %s and get knoxite progress", volumeId)
 	progress, err := knoxite.VerifyVolume(repository, volumeId, opts.Percentage)
 	if err != nil {
 		return err
@@ -99,7 +99,7 @@ func executeVerifySnapshot(snapshotId string, opts VerifyOptions) error {
 	}
 	logger.Info("Opened repository")
 
-	logger.Info(fmt.Sprintf("Verifying snapshot %s and get knoxite progress", snapshotId))
+	logger.Infof("Verifying snapshot %s and get knoxite progress", snapshotId)
 	progress, err := knoxite.VerifySnapshot(repository, snapshotId, opts.Percentage)
 	if err != nil {
 		return err

diff --git a/cmd/knoxite/volume.go b/cmd/knoxite/volume.go
@@ -92,14 +92,14 @@ func executeVolumeInit(name, description string) error {
 	}
 	logger.Info("Opened repository")
 
-	logger.Info(fmt.Sprintf("Creating volume %s", description))
+	logger.Infof("Creating volume %s", description)
 	vol, err := knoxite.NewVolume(name, description)
 	if err != nil {
 		return err
 	}
-	logger.Info(fmt.Sprintf("Created volume %s", vol.ID))
+	logger.Infof("Created volume %s", vol.ID)
 
-	logger.Info(fmt.Sprintf("Adding volume %s to repository", vol.ID))
+	logger.Infof("Adding volume %s to repository", vol.ID)
 	err = repository.AddVolume(vol)
 	if err != nil {
 		return fmt.Errorf("Creating volume %s failed: %v", name, err)
@@ -136,16 +136,16 @@ func executeVolumeRemove(volumeID string) error {
 	}
 	logger.Info("Opened chunk index")
 
-	logger.Info(fmt.Sprintf("Finding volume %s", volumeID))
+	logger.Infof("Finding volume %s", volumeID)
 	vol, err := repo.FindVolume(volumeID)
 	if err != nil {
 		return err
 	}
 	logger.Info("Found volume")
 
-	logger.Info(fmt.Sprintf("Iterating over all snapshots of volume %s to remove them", volumeID))
+	logger.Infof("Iterating over all snapshots of volume %s to remove them", volumeID)
 	for _, s := range vol.Snapshots {
-		logger.Debug(fmt.Sprintf("Removing snapshot %s", s))
+		logger.Debugf("Removing snapshot %s", s)
 		if err := vol.RemoveSnapshot(s); err != nil {
 			return err
 		}
@@ -155,7 +155,7 @@ func executeVolumeRemove(volumeID string) error {
 	}
 	logger.Info("Removed all snapshots from volume")
 
-	logger.Info(fmt.Sprintf("Removing volume %s from repository", volumeID))
+	logger.Infof("Removing volume %s from repository", volumeID)
 	if err := repo.RemoveVolume(vol); err != nil {
 		return err
 	}