Merge PR #4884: Fix standalone execution

2019-08-11 23:42:10 +01:00 · 2019-08-11 23:42:10 +01:00 · 8f51fb39cb
commit 8f51fb39cb
parent e4c8bd72b7
2 changed files with 5 additions and 1 deletions
--- a/.pending/bugfixes/tendermint/_4879-Don-t-terminat
+++ b/.pending/bugfixes/tendermint/_4879-Don-t-terminat
@ -0,0 +1 @@
+#4879 Don't terminate the process immediately after startup when run in standalone mode.
--- a/server/start.go
+++ b/server/start.go
@ -89,7 +89,6 @@ func startStandAlone(ctx *Context, appCreator AppCreator) error {
 		cmn.Exit(err.Error())
 	}

-	// wait forever
 	cmn.TrapSignal(ctx.Logger, func() {
 		// cleanup
 		err = svr.Stop()
@ -97,6 +96,10 @@ func startStandAlone(ctx *Context, appCreator AppCreator) error {
 			cmn.Exit(err.Error())
 		}
 	})
+
+	// run forever (the node will not be returned)
+	select {}
+
 	return nil
 }
				`@ -0,0 +1 @@`
				`#4879 Don't terminate the process immediately after startup when run in standalone mode.`