atcoder
diff --git a/‎server.go
Copy file name to clipboardExpand all lines: server.go
+6-39Lines changed: 6 additions & 39 deletions b/‎server.go
Copy file name to clipboardExpand all lines: server.go
+6-39Lines changed: 6 additions & 39 deletions
@@ -3,7 +3,6 @@ package revel
 import (
 	"code.google.com/p/go.net/websocket"
 	"fmt"
-	"github.com/rcrowley/goagain"
 	"io"
 	"net"
 	"net/http"
@@ -111,46 +110,14 @@ func Run(port int) {
 			// to terminate SSL upstream when using unix domain sockets.
 			ERROR.Fatalln("SSL is only supported for TCP sockets. Specify a port to listen on.")
 		}
-		ERROR.Fatalln("Failed to listen:", Server.ListenAndServeTLS(HttpSslCert, HttpSslKey))
-	} else if Config.BoolDefault("graceful", false) {
-		serveGraceful(network, localAddress)
+		ERROR.Fatalln("Failed to listen:",
+			Server.ListenAndServeTLS(HttpSslCert, HttpSslKey))
 	} else {
-		ERROR.Fatalln("Failed to serve:", Server.Serve(listen(network, localAddress)))
-	}
-}
-
-func listen(network, localAddress string) net.Listener {
-	listener, err := net.Listen(network, localAddress)
-	if err != nil {
-		ERROR.Fatalln("Failed to listen:", err)
-	}
-	return listener
-}
-
-func serveGraceful(network, localAddress string) {
-	listener, err := goagain.Listener()
-
-	if err != nil {
-		// New process, create the listener.
-		listener = listen(network, localAddress)
-		go Server.Serve(listener)
-	} else {
-		// Forked child, recover the listener.
-		INFO.Println("Resuming listening on", listener.Addr())
-		go Server.Serve(listener)
-
-		// Child is ready to accept connections, kill parent process.
-		if err := goagain.Kill(); err != nil {
-			ERROR.Println("Failed to kill parent:", err)
+		listener, err := net.Listen(network, localAddress)
+		if err != nil {
+			ERROR.Fatalln("Failed to listen:", err)
 		}
-	}
-
-	if _, err := goagain.Wait(listener); err != nil {
-		ERROR.Fatalln("Failed to serve:", err)
-	}
-
-	if err := listener.Close(); err != nil {
-		ERROR.Fatalln("Failed to close listener:", err)
+		ERROR.Fatalln("Failed to serve:", Server.Serve(listener))
 	}
 }