server: paths updates for server socket

vbatts · vbatts · commit f7aeb281b9e1 · 2018-07-10T13:54:37.000-04:00
Many of these paths need platform specific values or even handling of
named pipes.

Signed-off-by: Vincent Batts &lt;vbatts@hashbangbash.com&gt;
diff --git a/cmd/crio/main.go b/cmd/crio/main.go
@@ -496,7 +496,7 @@ func main() {
 				logrus.Fatal(err)
 			}
 		}
-		lis, err := net.Listen("unix", config.Listen)
+		lis, err := server.Listen("unix", config.Listen)
 		if err != nil {
 			logrus.Fatalf("failed to listen: %v", err)
 		}
diff --git a/server/listen_unix.go b/server/listen_unix.go
@@ -0,0 +1,12 @@
+// +build !windows
+
+package server
+
+import "net"
+
+// Listen opens the network address for the server. Expects the config.Listen address.
+//
+// This is a platform specific wrapper.
+func Listen(network, address string) (net.Listener, error) {
+	return net.Listen(network, address)
+}
diff --git a/server/listen_windows.go b/server/listen_windows.go
@@ -0,0 +1,15 @@
+// +build windows
+
+package server
+
+import (
+	"fmt"
+	"net"
+)
+
+// Listen opens the network address for the server. Expects the config.Listen address.
+//
+// This is a platform specific wrapper.
+func Listen(network, address string) (net.Listener, error) {
+	return nil, fmt.Errorf("not implemented")
+}

Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,7 @@ func main() {`
`496`	`496`	`logrus.Fatal(err)`
`497`	`497`	`}`
`498`	`498`	`}`
`499`		`- lis, err := net.Listen("unix", config.Listen)`
	`499`	`+ lis, err := server.Listen("unix", config.Listen)`
`500`	`500`	`if err != nil {`
`501`	`501`	`logrus.Fatalf("failed to listen: %v", err)`
`502`	`502`	`}`