Skip to content

Commit

Permalink
Backport of When running under systemd, send ready when server comple…
Browse files Browse the repository at this point in the history
…ted reloading config #7028 into release/1.10.x (#15265)

* backport of commit d230c83

* backport of commit 56fba39

Co-authored-by: Alexander Tischenko <tsm@fiberside.ru>
Co-authored-by: Nick Cabatoff <ncabatoff@hashicorp.com>
  • Loading branch information
3 people authored May 9, 2022
1 parent af86659 commit aa7add7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions changelog/15041.txt
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
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

0 comments on commit aa7add7

Please sign in to comment.