EnumDev/enit
1
0
Fork 0
mirror of https://github.com/EnumeratedDev/enit.git synced 2026-09-16 02:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

ectl: return error in dialSocket

Browse Source
This commit is contained in:
EnumDev
2026-01-31 09:58:07 +02:00
parent f263ec06cc
commit a3403ca151
1 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ectl/sv_subcommand.go
+26 -8
View File
@@ -35,8 +35,12 @@ func handleServiceSubcommand() {
setupFlagsAndHelp(currentFlagSet, fmt.Sprintf("ectl %s %s <options> <service>", os.Args[1], subcommand), fmt.Sprintf("%s the specified service", strings.Title(subcommand)), os.Args[3:]) setupFlagsAndHelp(currentFlagSet, fmt.Sprintf("ectl %s %s <options> <service>", os.Args[1], subcommand), fmt.Sprintf("%s the specified service", strings.Title(subcommand)), os.Args[3:])
// Dial esvm socket // Dial esvm socket
dialSocket() err := dialSocket()
if err == nil {
defer conn.Close() defer conn.Close()
} else {
log.Fatalf("Error: %s", err)
}
startStopRestartService(subcommand) startStopRestartService(subcommand)
case "enable", "disable": case "enable", "disable":
@@ -53,8 +57,12 @@ func handleServiceSubcommand() {
setupFlagsAndHelp(currentFlagSet, fmt.Sprintf("ectl %s status <options> <service>", os.Args[1]), "Show service status", os.Args[3:]) setupFlagsAndHelp(currentFlagSet, fmt.Sprintf("ectl %s status <options> <service>", os.Args[1]), "Show service status", os.Args[3:])
// Dial esvm socket // Dial esvm socket
dialSocket() err := dialSocket()
if err == nil {
defer conn.Close() defer conn.Close()
} else {
log.Fatalf("Error: %s", err)
}
showServiceStatus() showServiceStatus()
case "list": case "list":
@@ -64,8 +72,12 @@ func handleServiceSubcommand() {
setupFlagsAndHelp(currentFlagSet, fmt.Sprintf("ectl %s reload <options>", os.Args[1]), "List all services", os.Args[3:]) setupFlagsAndHelp(currentFlagSet, fmt.Sprintf("ectl %s reload <options>", os.Args[1]), "List all services", os.Args[3:])
// Dial esvm socket // Dial esvm socket
dialSocket() err := dialSocket()
if err == nil {
defer conn.Close() defer conn.Close()
} else {
log.Fatalf("Error: %s", err)
}
listAllServices() listAllServices()
case "reload": case "reload":
@@ -75,8 +87,12 @@ func handleServiceSubcommand() {
setupFlagsAndHelp(currentFlagSet, fmt.Sprintf("ectl %s reload <options>", os.Args[1]), "Reload all services", os.Args[3:]) setupFlagsAndHelp(currentFlagSet, fmt.Sprintf("ectl %s reload <options>", os.Args[1]), "Reload all services", os.Args[3:])
// Dial esvm socket // Dial esvm socket
dialSocket() err := dialSocket()
if err == nil {
defer conn.Close() defer conn.Close()
} else {
log.Fatalf("Error: %s", err)
}
reloadAllServices() reloadAllServices()
default: default:
@@ -444,20 +460,22 @@ func setupFlagsAndHelp(flagset *flag.FlagSet, usage, desc string, args []string)
flagset.Parse(args) flagset.Parse(args)
} }
func dialSocket() { func dialSocket() error {
if _, err := os.Stat(path.Join(runstatedir, "esvm/esvm.sock")); err != nil { if _, err := os.Stat(path.Join(runstatedir, "esvm/esvm.sock")); err != nil {
log.Fatalf("Could not find esvm.sock! Error: %s\n", err) return fmt.Errorf("could not find socket! Error: %s", err)
} }
var err error var err error
conn, err = net.Dial("unix", path.Join(runstatedir, "esvm/esvm.sock")) conn, err = net.Dial("unix", path.Join(runstatedir, "esvm/esvm.sock"))
if err != nil { if err != nil {
log.Fatalf("Failed to connect to esvm.sock! Error: %s\n", err) return fmt.Errorf("could not connect to socket! Error: %s", err)
} }
if err := conn.SetDeadline(time.Now().Add(30 * time.Second)); err != nil { if err := conn.SetDeadline(time.Now().Add(30 * time.Second)); err != nil {
log.Fatalf("Failed to set write deadline! Error: %s\n", err) return fmt.Errorf("failed to set socket deadline! Error: %s", err)
} }
return nil
} }
func readAllConn(conn net.Conn) ([]byte, error) { func readAllConn(conn net.Conn) ([]byte, error) {