simplify files organization

notify.go

@@ -1,34 +1,70 @@
-// +build linux
-
 package systemd
 
 import (
 	"fmt"
 	"net"
-	"os"
 )
 
-var socket *net.UnixAddr
+var notifySocket *net.UnixAddr
 
-func init() {
-	notifySocket := os.Getenv("NOTIFY_SOCKET")
-	if notifySocket != "" {
-		return
-	}
-	socket = &net.UnixAddr{
-		Name: notifySocket,
-		Net:  "unixgram",
-	}
+// IsNotifyEnabled tells if systemd notify socket has been detected or not.
+func IsNotifyEnabled() bool {
+	return notifySocket != nil
+}
+
+// NotifyReady sends systemd notify READY=1
+func NotifyReady() error {
+	return NotifyRaw("READY=1")
+}
+
+// NotifyReloading sends systemd notify RELOADING=1
+func NotifyReloading() error {
+	return NotifyRaw("RELOADING=1")
+}
+
+// NotifyStopping sends systemd notify STOPPING=1
+func NotifyStopping() error {
+	return NotifyRaw("STOPPING=1")
+}
+
+// NotifyStatus sends systemd notify STATUS=%s{status}
+func NotifyStatus(status string) error {
+	return NotifyRaw(fmt.Sprintf("STATUS=%s", status))
+}
+
+// NotifyErrNo sends systemd notify ERRNO=%d{errno}
+func NotifyErrNo(errno int) error {
+	return NotifyRaw(fmt.Sprintf("ERRNO=%d", errno))
+}
+
+// NotifyBusError sends systemd notify BUSERROR=%s{buserror}
+func NotifyBusError(buserror string) error {
+	return NotifyRaw(fmt.Sprintf("BUSERROR=%s", buserror))
+}
+
+// NotifyMainPID sends systemd notify MAINPID=%d{mainpid}
+func NotifyMainPID(mainpid int) error {
+	return NotifyRaw(fmt.Sprintf("MAINPID=%d", mainpid))
+}
+
+// NotifyWatchDog sends systemd notify WATCHDOG=1
+func NotifyWatchDog() error {
+	return NotifyRaw("WATCHDOG=1")
+}
+
+// NotifyWatchDogUSec sends systemd notify WATCHDOG_USEC=%d{µsec}
+func NotifyWatchDogUSec(usec int64) error {
+	return NotifyRaw(fmt.Sprintf("WATCHDOG_USEC=%d", usec))
 }
 
 // NotifyRaw send state thru the notify socket if any.
 // If the notify socket was not detected, it is a noop call.
 // Use IsNotifyEnabled() to determine if the notify socket has been detected.
 func NotifyRaw(state string) error {
-	if socket == nil {
+	if notifySocket == nil {
 		return nil
 	}
-	conn, err := net.DialUnix(socket.Net, nil, socket)
+	conn, err := net.DialUnix(notifySocket.Net, nil, notifySocket)
 	if err != nil {
 		return fmt.Errorf("can't open unix socket: %v", err)
 	}

notify_init.go

@@ -0,0 +1,17 @@
+// +build linux
+
+package systemd
+
+import (
+	"net"
+	"os"
+)
+
+func init() {
+	if notifySocketName := os.Getenv("NOTIFY_SOCKET"); notifySocketName != "" {
+		notifySocket = &net.UnixAddr{
+			Name: notifySocketName,
+			Net:  "unixgram",
+		}
+	}
+}

watchdog.go

@@ -65,7 +65,7 @@ func getWatchDogInterval() (interval time.Duration, err error) {
 
 // SendHeartbeat sends a keepalive notification to systemd watchdog
 func (c *WatchDog) SendHeartbeat() error {
-	if socket == nil {
+	if notifySocket == nil {
 		return errors.New("failed to notify watchdog: systemd notify is diabled")
 	}
 	return NotifyWatchDog()