Systemd readiness notification
This change implements the systemd readiness notification, using the sd_notify protocol. See https://www.freedesktop.org/software/systemd/man/sd_notify.html.
This commit is contained in:
parent
1d80c12e18
commit
89c1b3b4d8
4 changed files with 51 additions and 5 deletions
|
@ -44,6 +44,11 @@ func startDaemon(store *storage.Storage) {
|
||||||
go collector.GatherStorageMetrics()
|
go collector.GatherStorageMetrics()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Notify systemd that we are ready.
|
||||||
|
if err := sdNotify(sdNotifyReady); err != nil {
|
||||||
|
logger.Error("Unable to send readiness notification to systemd: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
<-stop
|
<-stop
|
||||||
logger.Info("Shutting down the process...")
|
logger.Info("Shutting down the process...")
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||||
|
|
42
cli/sd_notify.go
Normal file
42
cli/sd_notify.go
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
// Copyright 2021 Frédéric Guillot. All rights reserved.
|
||||||
|
// Use of this source code is governed by the Apache 2.0
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package cli // import "miniflux.app/cli"
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
"os"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// sdNotifyReady tells the service manager that service startup is
|
||||||
|
// finished, or the service finished loading its configuration.
|
||||||
|
sdNotifyReady = "READY=1"
|
||||||
|
)
|
||||||
|
|
||||||
|
// sdNotify sends a message to systemd using the sd_notify protocol.
|
||||||
|
// See https://www.freedesktop.org/software/systemd/man/sd_notify.html.
|
||||||
|
func sdNotify(state string) error {
|
||||||
|
addr := &net.UnixAddr{
|
||||||
|
Net: "unixgram",
|
||||||
|
Name: os.Getenv("NOTIFY_SOCKET"),
|
||||||
|
}
|
||||||
|
|
||||||
|
if addr.Name == "" {
|
||||||
|
// We're not running under systemd (NOTIFY_SOCKET has not set).
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
conn, err := net.DialUnix(addr.Net, nil, addr)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
|
||||||
|
if _, err = conn.Write([]byte(state)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
2
go.sum
2
go.sum
|
@ -204,8 +204,6 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
|
||||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||||
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
|
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
|
||||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||||
github.com/lib/pq v1.9.0 h1:L8nSXQQzAYByakOFMTwpjRoHsMJklur4Gi59b6VivR8=
|
|
||||||
github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
|
||||||
github.com/lib/pq v1.10.0 h1:Zx5DJFEYQXio93kgXnQ09fXNiUKsqv4OUEu2UtGcB1E=
|
github.com/lib/pq v1.10.0 h1:Zx5DJFEYQXio93kgXnQ09fXNiUKsqv4OUEu2UtGcB1E=
|
||||||
github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||||
github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
|
github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
|
||||||
|
|
|
@ -9,12 +9,13 @@ Description=Miniflux Feed Reader
|
||||||
After=network.target postgresql.service
|
After=network.target postgresql.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=notify
|
||||||
EnvironmentFile=/etc/miniflux.conf
|
|
||||||
User=miniflux
|
|
||||||
ExecStart=/usr/bin/miniflux
|
ExecStart=/usr/bin/miniflux
|
||||||
Restart=always
|
Restart=always
|
||||||
|
|
||||||
|
EnvironmentFile=/etc/miniflux.conf
|
||||||
|
User=miniflux
|
||||||
|
|
||||||
# https://www.freedesktop.org/software/systemd/man/systemd.exec.html#NoNewPrivileges=
|
# https://www.freedesktop.org/software/systemd/man/systemd.exec.html#NoNewPrivileges=
|
||||||
NoNewPrivileges=true
|
NoNewPrivileges=true
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue