From 711945147bdba4387b87013a135f363ff5513b0f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 4 Jan 2021 21:48:28 -0500 Subject: [PATCH] refactor: use --watch-config instead of signaling the container to reload config --- plugins/common/docker.go | 5 ----- plugins/logs/functions.go | 10 ++-------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/plugins/common/docker.go b/plugins/common/docker.go index 51f24f5b2..492e754c6 100644 --- a/plugins/common/docker.go +++ b/plugins/common/docker.go @@ -244,11 +244,6 @@ func DockerInspect(containerOrImageID, format string) (output string, err error) return } -// DockerSignal sends a given signal (in string form) to a docker container -func DockerSignal(containerID, signal string) (err error) { - return sh.Command(DockerBin(), "kill", fmt.Sprintf("--signal=%s", signal), containerID).Run() -} - // IsImageHerokuishBased returns true if app image is based on herokuish func IsImageHerokuishBased(image string, appName string) bool { output, err := DockerInspect(image, "{{range .Config.Env}}{{if eq . \"USER=herokuishuser\" }}{{println .}}{{end}}{{end}}") diff --git a/plugins/logs/functions.go b/plugins/logs/functions.go index 87f6b348b..2587d3341 100644 --- a/plugins/logs/functions.go +++ b/plugins/logs/functions.go @@ -74,7 +74,7 @@ func startVectorContainer(vectorImage string) error { "--volume", "/var/run/docker.sock:/var/run/docker.sock", "--volume", common.MustGetEnv("DOKKU_LOGS_HOST_DIR") + ":/var/logs/dokku/apps", vectorImage, - "--config", "/etc/vector/vector.json"}, " ")) + "--config", "/etc/vector/vector.json", "--watch-config"}, " ")) if !cmd.Execute() { return errors.New("Unable to start vector container") @@ -222,11 +222,5 @@ func writeVectorConfig() error { return err } - if !common.ContainerExists(vectorContainerName) { - return nil - } - - return common.SuppressOutput(func() error { - return common.DockerSignal(vectorContainerName, "HUP") - }) + return nil }