atcoder
diff --git a/‎harness/app.go
Copy file name to clipboardExpand all lines: harness/app.go
+17Lines changed: 17 additions & 0 deletions b/‎harness/app.go
Copy file name to clipboardExpand all lines: harness/app.go
+17Lines changed: 17 additions & 0 deletions
diff --git a/‎harness/build.go
Copy file name to clipboardExpand all lines: harness/build.go
+16Lines changed: 16 additions & 0 deletions b/‎harness/build.go
Copy file name to clipboardExpand all lines: harness/build.go
+16Lines changed: 16 additions & 0 deletions
diff --git a/‎harness/harness.go
Copy file name to clipboardExpand all lines: harness/harness.go
+6-3Lines changed: 6 additions & 3 deletions b/‎harness/harness.go
Copy file name to clipboardExpand all lines: harness/harness.go
+6-3Lines changed: 6 additions & 3 deletions
@@ -91,6 +91,23 @@ func (cmd AppCmd) Kill() {
 	}
 }
 
+// Gracefully terminate the app server if it's running
+func (cmd *AppCmd) Terminate() {
+	if cmd.Cmd != nil && (cmd.ProcessState == nil || !cmd.ProcessState.Exited()) {
+		revel.TRACE.Println("Terminating revel server pid", cmd.Process.Pid)
+		cmd.Process.Signal(os.Interrupt)
+		select {
+		case <-cmd.waitChan():
+			return
+		case <-time.After(10 * time.Second):
+			revel.TRACE.Println("Timeout; Force kill revel server pid", cmd.Process.Pid)
+			cmd.Process.Kill()
+			return
+		}
+		panic("Impossible")
+	}
+}
+
 // Return a channel that is notified when Wait() returns.
 func (cmd AppCmd) waitChan() <-chan struct{} {
 	ch := make(chan struct{}, 1)
 
@@ -311,6 +311,8 @@ package main
 
 import (
 	"flag"
+	"os"
+	"os/signal"
 	"reflect"
 	"github.com/revel/revel"{{range $k, $v := $.ImportPaths}}
 	{{$v}} "{{$k}}"{{end}}
@@ -356,6 +358,20 @@ func main() {
 		(*{{index $.ImportPaths .ImportPath}}.{{.StructName}})(nil),{{end}}
 	}
 
+	signalChannel := make(chan os.Signal, 1)
+	signal.Notify(signalChannel,
+		os.Interrupt, os.Kill)
+
+	go func() {
+		sig := <- signalChannel
+		revel.INFO.Println("Server interrupt")
+		switch sig {
+		case os.Interrupt, os.Kill:
+			revel.StopServer()
+			break
+		}
+	} ()
+
 	revel.Run(*port)
 }
 `
 
@@ -120,7 +120,8 @@ func NewHarness() *Harness {
 // Rebuild the Revel application and run it on the given port.
 func (h *Harness) Refresh() (err *revel.Error) {
 	if h.app != nil {
-		h.app.Kill()
+		//h.app.Kill()
+		h.app.cmd.Terminate()
 	}
 
 	revel.TRACE.Println("Rebuild")
@@ -176,12 +177,14 @@ func (h *Harness) Run() {
 		}
 	}()
 
-	// Kill the app on signal.
+	// Kill the app on signal
+	// TODO: can we make this work if the app is being run directly instead of via the `revel run` command aka the harness?
 	ch := make(chan os.Signal)
 	signal.Notify(ch, os.Interrupt, os.Kill)
 	<-ch
 	if h.app != nil {
-		h.app.Kill()
+		//h.app.Kill()
+		h.app.cmd.Terminate()
 	}
 	os.Exit(1)
 }