change logging locations

hookenz · hookenz · commit 64c08518f555 · 2022-03-25T17:16:37.000+13:00
diff --git a/compose/compose.go b/compose/compose.go
@@ -18,7 +18,7 @@ func NewComposeDeployer(binaryPath, configPath string) (libstack.Deployer, error
 	}
 
 	if err == errors.ErrBinaryNotFound {
-		log.Printf("[INFO] [main,compose] [message: binary is missing, falling-back to compose plugin] [error: %s]", err)
+		log.Printf("[INFO] [compose] [message: binary is missing, falling-back to compose plugin] [error: %s]", err)
 		return composeplugin.NewPluginWrapper(binaryPath, configPath)
 	}
 
diff --git a/compose/internal/composebinary/composebinary.go b/compose/internal/composebinary/composebinary.go
@@ -39,8 +39,8 @@ func (wrapper *ComposeWrapper) Deploy(ctx context.Context, workingDir, host, pro
 			return err
 		}
 
-		log.Printf("[INFO] [libstack,composebinary] [message: Stack deployment successful]")
-		log.Printf("[DEBUG] [libstack,composebinary] [output: %s]", output)
+		log.Printf("[INFO] [compose,internal,composebinary] [message: Stack deployment successful]")
+		log.Printf("[DEBUG] [compose,internal,composebinary] [output: %s]", output)
 	}
 
 	return err
@@ -54,8 +54,8 @@ func (wrapper *ComposeWrapper) Remove(ctx context.Context, workingDir, host, pro
 			return err
 		}
 
-		log.Printf("[INFO] [libstack,composebinary] [message: Stack removal successful]")
-		log.Printf("[DEBUG] [libstack,composebinary] [output: %s]", output)
+		log.Printf("[INFO] [compose,internal,composebinary] [message: Stack removal successful]")
+		log.Printf("[DEBUG] [compose,internal,composebinary] [output: %s]", output)
 	}
 
 	return err
@@ -70,8 +70,8 @@ func (wrapper *ComposeWrapper) Pull(ctx context.Context, workingDir, host, proje
 			return err
 		}
 
-		log.Printf("[INFO] [libstack,composebinary] [message: Stack pull successful]")
-		log.Printf("[DEBUG] [libstack,composebinary] [output: %s]", output)
+		log.Printf("[INFO] [compose,internal,composebinary] [message: Stack pull successful]")
+		log.Printf("[DEBUG] [compose,internal,composebinary] [output: %s]", output)
 	}
 
 	return err
diff --git a/compose/internal/composeplugin/composeplugin.go b/compose/internal/composeplugin/composeplugin.go
@@ -69,8 +69,8 @@ func (wrapper *PluginWrapper) Deploy(ctx context.Context, workingDir, host, proj
 			return err
 		}
 
-		log.Printf("[INFO] [libstack,composeplugin] [message: Stack deployment successful]")
-		log.Printf("[DEBUG] [libstack,composeplugin] [output: %s]", output)
+		log.Printf("[INFO] [compose,internal,composeplugin] [message: Stack deployment successful]")
+		log.Printf("[DEBUG] [compose,internal,composeplugin] [output: %s]", output)
 	}
 
 	return err
@@ -84,8 +84,8 @@ func (wrapper *PluginWrapper) Remove(ctx context.Context, workingDir, host, proj
 			return err
 		}
 
-		log.Printf("[INFO] [libstack,composeplugin] [message: Stack removal successful]")
-		log.Printf("[DEBUG] [libstack,composeplugin] [output: %s]", output)
+		log.Printf("[INFO] [compose,internal,composeplugin] [message: Stack removal successful]")
+		log.Printf("[DEBUG] [compose,internal,composeplugin] [output: %s]", output)
 	}
 
 	return err
@@ -99,8 +99,8 @@ func (wrapper *PluginWrapper) Pull(ctx context.Context, workingDir, host, projec
 			return err
 		}
 
-		log.Printf("[INFO] [libstack,composeplugin] [message: Stack pull successful]")
-		log.Printf("[DEBUG] [libstack,composeplugin] [output: %s]", output)
+		log.Printf("[INFO] [compose,internal,composeplugin] [message: Stack pull successful]")
+		log.Printf("[DEBUG] [compose,internal,composeplugin] [output: %s]", output)
 	}
 
 	return err

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ func NewComposeDeployer(binaryPath, configPath string) (libstack.Deployer, error`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`if err == errors.ErrBinaryNotFound {`
`21`		`- log.Printf("[INFO] [main,compose] [message: binary is missing, falling-back to compose plugin] [error: %s]", err)`
	`21`	`+ log.Printf("[INFO] [compose] [message: binary is missing, falling-back to compose plugin] [error: %s]", err)`
`22`	`22`	`return composeplugin.NewPluginWrapper(binaryPath, configPath)`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ func (wrapper *ComposeWrapper) Deploy(ctx context.Context, workingDir, host, pro`
`39`	`39`	`return err`
`40`	`40`	`}`
`41`	`41`
`42`		`- log.Printf("[INFO] [libstack,composebinary] [message: Stack deployment successful]")`
`43`		`- log.Printf("[DEBUG] [libstack,composebinary] [output: %s]", output)`
	`42`	`+ log.Printf("[INFO] [compose,internal,composebinary] [message: Stack deployment successful]")`
	`43`	`+ log.Printf("[DEBUG] [compose,internal,composebinary] [output: %s]", output)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`return err`
`@@ -54,8 +54,8 @@ func (wrapper *ComposeWrapper) Remove(ctx context.Context, workingDir, host, pro`
`54`	`54`	`return err`
`55`	`55`	`}`
`56`	`56`
`57`		`- log.Printf("[INFO] [libstack,composebinary] [message: Stack removal successful]")`
`58`		`- log.Printf("[DEBUG] [libstack,composebinary] [output: %s]", output)`
	`57`	`+ log.Printf("[INFO] [compose,internal,composebinary] [message: Stack removal successful]")`
	`58`	`+ log.Printf("[DEBUG] [compose,internal,composebinary] [output: %s]", output)`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`return err`
`@@ -70,8 +70,8 @@ func (wrapper *ComposeWrapper) Pull(ctx context.Context, workingDir, host, proje`
`70`	`70`	`return err`
`71`	`71`	`}`
`72`	`72`
`73`		`- log.Printf("[INFO] [libstack,composebinary] [message: Stack pull successful]")`
`74`		`- log.Printf("[DEBUG] [libstack,composebinary] [output: %s]", output)`
	`73`	`+ log.Printf("[INFO] [compose,internal,composebinary] [message: Stack pull successful]")`
	`74`	`+ log.Printf("[DEBUG] [compose,internal,composebinary] [output: %s]", output)`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ func (wrapper *PluginWrapper) Deploy(ctx context.Context, workingDir, host, proj`
`69`	`69`	`return err`
`70`	`70`	`}`
`71`	`71`
`72`		`- log.Printf("[INFO] [libstack,composeplugin] [message: Stack deployment successful]")`
`73`		`- log.Printf("[DEBUG] [libstack,composeplugin] [output: %s]", output)`
	`72`	`+ log.Printf("[INFO] [compose,internal,composeplugin] [message: Stack deployment successful]")`
	`73`	`+ log.Printf("[DEBUG] [compose,internal,composeplugin] [output: %s]", output)`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`return err`
`@@ -84,8 +84,8 @@ func (wrapper *PluginWrapper) Remove(ctx context.Context, workingDir, host, proj`
`84`	`84`	`return err`
`85`	`85`	`}`
`86`	`86`
`87`		`- log.Printf("[INFO] [libstack,composeplugin] [message: Stack removal successful]")`
`88`		`- log.Printf("[DEBUG] [libstack,composeplugin] [output: %s]", output)`
	`87`	`+ log.Printf("[INFO] [compose,internal,composeplugin] [message: Stack removal successful]")`
	`88`	`+ log.Printf("[DEBUG] [compose,internal,composeplugin] [output: %s]", output)`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`return err`
`@@ -99,8 +99,8 @@ func (wrapper *PluginWrapper) Pull(ctx context.Context, workingDir, host, projec`
`99`	`99`	`return err`
`100`	`100`	`}`
`101`	`101`
`102`		`- log.Printf("[INFO] [libstack,composeplugin] [message: Stack pull successful]")`
`103`		`- log.Printf("[DEBUG] [libstack,composeplugin] [output: %s]", output)`
	`102`	`+ log.Printf("[INFO] [compose,internal,composeplugin] [message: Stack pull successful]")`
	`103`	`+ log.Printf("[DEBUG] [compose,internal,composeplugin] [output: %s]", output)`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`return err`