Fix remove unix socket listenAddr (#846)

repsac-by · lunny · commit c73b7a65f5ca · 2017-02-05T20:27:37.000+08:00
Because the absence of the listenAddr is what is expected.
The error will only be then when we can't remove.
diff --git a/cmd/web.go b/cmd/web.go
@@ -654,7 +654,7 @@ func runWeb(ctx *cli.Context) error {
 	case setting.FCGI:
 		err = fcgi.Serve(nil, m)
 	case setting.UnixSocket:
-		if err := os.Remove(listenAddr); err != nil {
+		if err := os.Remove(listenAddr); err != nil && !os.IsNotExist(err) {
 			log.Fatal(4, "Failed to remove unix socket directory %s: %v", listenAddr, err)
 		}
 		var listener *net.UnixListener

Original file line number	Diff line number	Diff line change
`@@ -654,7 +654,7 @@ func runWeb(ctx *cli.Context) error {`
`654`	`654`	`case setting.FCGI:`
`655`	`655`	`err = fcgi.Serve(nil, m)`
`656`	`656`	`case setting.UnixSocket:`
`657`		`- if err := os.Remove(listenAddr); err != nil {`
	`657`	`+ if err := os.Remove(listenAddr); err != nil && !os.IsNotExist(err) {`
`658`	`658`	`log.Fatal(4, "Failed to remove unix socket directory %s: %v", listenAddr, err)`
`659`	`659`	`}`
`660`	`660`	`var listener *net.UnixListener`