aboutsummaryrefslogtreecommitdiffhomepage
path: root/cmd/commandfuncs.go
diff options
context:
space:
mode:
authorCarl George <[email protected]>2021-04-05 15:01:20 -0500
committerGitHub <[email protected]>2021-04-05 14:01:20 -0600
commit45fb7202ac0e606ccb7b4fe95f169424f0a6cabc (patch)
treebaa42e2399a69f7f65f487406cac16b977cfe827 /cmd/commandfuncs.go
parent66783eb4d966c01e3ecdcd456fa4a205de9c560b (diff)
downloadcaddy-45fb7202ac0e606ccb7b4fe95f169424f0a6cabc.tar.gz
caddy-45fb7202ac0e606ccb7b4fe95f169424f0a6cabc.zip
notify: Send all sd_notify signals from main caddy process (#4060)
Initial sd_notify support was added in #3963, but that sent signals from both cmdRun and cmdReload. This approach has two drawbacks: - Reloads initiated via the API do not send signals. - The signals are sent from different processes, which requires the `NotifyAccess=exec` directive in the unit file. This change moves the NotifyReloading and NotifyReadiness invocations to Load, which address both of those drawbacks. It also adds a complimentary NotifyStopping method which is invoked from handleStop. All the notify methods are defined in a notify package to avoid an import loop.
Diffstat (limited to 'cmd/commandfuncs.go')
-rw-r--r--cmd/commandfuncs.go13
1 files changed, 0 insertions, 13 deletions
diff --git a/cmd/commandfuncs.go b/cmd/commandfuncs.go
index 77d95b9a6..d32b9c763 100644
--- a/cmd/commandfuncs.go
+++ b/cmd/commandfuncs.go
@@ -269,10 +269,6 @@ func cmdRun(fl Flags) (int, error) {
}
}
- if err := NotifyReadiness(); err != nil {
- caddy.Log().Error("unable to notify readiness to service manager", zap.Error(err))
- }
-
select {}
}
@@ -294,15 +290,6 @@ func cmdReload(fl Flags) (int, error) {
reloadCmdAddrFlag := fl.String("address")
reloadCmdForceFlag := fl.Bool("force")
- if err := NotifyReloading(); err != nil {
- caddy.Log().Error("unable to notify reloading to service manager", zap.Error(err))
- }
- defer func() {
- if err := NotifyReadiness(); err != nil {
- caddy.Log().Error("unable to notify readiness to service manager", zap.Error(err))
- }
- }()
-
// get the config in caddy's native format
config, configFile, err := loadConfig(reloadCmdConfigFlag, reloadCmdConfigAdapterFlag)
if err != nil {