totole/revel-cmd
1
0
Fork 0
mirror of https://github.com/kevin-DL/revel-cmd.git synced 2026-01-19 21:55:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97 from notzippy/listener-fix

Browse Source 
Changed listener to be a pointer receiver
This commit is contained in:
notzippy
2017-08-25 15:55:14 -07:00
committed by GitHub
parent 01494f75fb c0a515facf
commit 3f136726db
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harness/app.go
View File

@@ -58,7 +58,7 @@ func NewAppCmd(binPath string, port int) AppCmd {
// Start the app server, and wait until it is ready to serve requests. // Start the app server, and wait until it is ready to serve requests.
func (cmd AppCmd) Start() error { func (cmd AppCmd) Start() error {
listeningWriter := startupListeningWriter{os.Stdout, make(chan bool)} listeningWriter := &startupListeningWriter{os.Stdout, make(chan bool)}
cmd.Stdout = listeningWriter cmd.Stdout = listeningWriter
revel.TRACE.Println("Exec app:", cmd.Path, cmd.Args) revel.TRACE.Println("Exec app:", cmd.Path, cmd.Args)
if err := cmd.Cmd.Start(); err != nil { if err := cmd.Cmd.Start(); err != nil {
@@ -70,6 +70,7 @@ func (cmd AppCmd) Start() error {
return errors.New("revel/harness: app died") return errors.New("revel/harness: app died")
case <-time.After(30 * time.Second): case <-time.After(30 * time.Second):
revel.TRACE.Println("Killing revel server process did not respond after wait timeout", cmd.Process.Pid)
cmd.Kill() cmd.Kill()
return errors.New("revel/harness: app timed out") return errors.New("revel/harness: app timed out")
@@ -118,7 +119,7 @@ type startupListeningWriter struct {
notifyReady chan bool notifyReady chan bool
} }
func (w startupListeningWriter) Write(p []byte) (n int, err error) { func (w *startupListeningWriter) Write(p []byte) (n int, err error) {
if w.notifyReady != nil && bytes.Contains(p, []byte("Listening")) { if w.notifyReady != nil && bytes.Contains(p, []byte("Listening")) {
w.notifyReady <- true w.notifyReady <- true
w.notifyReady = nil w.notifyReady = nil