kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Replace all instances of wwlog.Printf

Browse Source 
wwlog provides named loggers for each level, which requires
less code and is clearer than wwlog.Printf. The code has
included a mix of both, but this commit consolidates existing
code on the per-level functions.

Signed-off-by: Jonathon Anderson <janderson@ciq.co>
This commit is contained in:
Jonathon Anderson
2022-09-11 08:00:23 -06:00
parent 09c6986114
commit 22910958b5
56 changed files with 331 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/app/wwctl/overlay/delete/main.go
View File

@@ -25,12 +25,12 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
overlayPath = overlay.OverlaySourceDir(overlayName)
if overlayPath == "" {
wwlog.Printf(wwlog.ERROR, "Overlay name did not resolve: '%s'\n", overlayName)
wwlog.Error("Overlay name did not resolve: '%s'\n", overlayName)
os.Exit(1)
}
if !util.IsDir(overlayPath) {
wwlog.Printf(wwlog.ERROR, "Overlay does not exist: %s\n", overlayName)
wwlog.Error("Overlay does not exist: %s\n", overlayName)
os.Exit(1)
}
@@ -55,22 +55,22 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
removePath := path.Join(overlayPath, fileName)
if !util.IsDir(removePath) && !util.IsFile(removePath) {
wwlog.Printf(wwlog.ERROR, "Path to remove doesn't exist in overlay: %s\n", removePath)
wwlog.Error("Path to remove doesn't exist in overlay: %s\n", removePath)
os.Exit(1)
}
if Force {
err := os.RemoveAll(removePath)
if err != nil {
wwlog.Printf(wwlog.ERROR, "Failed deleting file from overlay: %s:%s\n", overlayName, overlayPath)
wwlog.Printf(wwlog.ERROR, "%s\n", err)
wwlog.Error("Failed deleting file from overlay: %s:%s\n", overlayName, overlayPath)
wwlog.Error("%s\n", err)
os.Exit(1)
}
} else {
err := os.Remove(removePath)
if err != nil {
wwlog.Printf(wwlog.ERROR, "Failed deleting overlay: %s:%s\n", overlayName, overlayPath)
wwlog.Printf(wwlog.ERROR, "%s\n", err)
wwlog.Error("Failed deleting overlay: %s:%s\n", overlayName, overlayPath)
wwlog.Error("%s\n", err)
os.Exit(1)
}
}
@@ -79,13 +79,13 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
// Cleanup any empty directories left behind...
i := path.Dir(removePath)
for i != overlayPath {
wwlog.Printf(wwlog.DEBUG, "Evaluating directory to remove: %s\n", i)
wwlog.Debug("Evaluating directory to remove: %s\n", i)
err := os.Remove(i)
if err != nil {
break
}
wwlog.Printf(wwlog.VERBOSE, "Removed empty directory: %s\n", i)
wwlog.Verbose("Removed empty directory: %s\n", i)
i = path.Dir(i)
}
}