Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of When running under systemd, send ready when server completed reloading config #7028 into release/1.10.x #15265

Merged
merged 3 commits into from
May 9, 2022
Merged

Backport of When running under systemd, send ready when server completed reloading config #7028 into release/1.10.x #15265

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
657b841
backport of commit d230c83d53bcac45b76bb94d183de5c9b127c0ff
archaron Apr 14, 2022
342a850
backport of commit 56fba399971fc00a05930d4a822fe9759d927eda
archaron Apr 14, 2022
175ccdd
Merge branch 'release/1.10.x' into backport/fix-systemd-reload/forcib…
ncabatoff May 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/15041.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
core: fixed systemd reloading notification
```
3 changes: 3 additions & 0 deletions command/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1627,6 +1627,9 @@ func (c *ServerCommand) Run(args []string) int {
// changes in kms_libraries)
core.ReloadManagedKeyRegistryConfig()

// Notify systemd that the server has completed reloading config
c.notifySystemd(systemd.SdNotifyReady)

case <-c.SigUSR2Ch:
logWriter := c.logger.StandardWriter(&hclog.StandardLoggerOptions{})
pprof.Lookup("goroutine").WriteTo(logWriter, 2)
Expand Down