1
=== modified file 'runserver.go'
2
--- runserver.go	2011-12-05 19:15:00 +0000
3
+++ runserver.go	2012-02-15 13:33:18 +0000
4
@@ -48,7 +48,7 @@
5
48
48
6
49
	// try to check if the process is actually running by sending
49
	// try to check if the process is actually running by sending
7
50
	// it signal 0.
50
	// it signal 0.
9
51
	err = p.Signal(os.UnixSignal(0))
51
	err = p.Signal(syscall.Signal(0))
10
52
	if err == nil {
52
	if err == nil {
11
53
		return p, nil
53
		return p, nil
12
54
	}
54
	}
13
@@ -136,7 +136,7 @@
14
136
	// anyway or that we can't wait for it for some other reason,
136
	// anyway or that we can't wait for it for some other reason,
15
137
	// for example because it was originally started by some other process.
137
	// for example because it was originally started by some other process.
16
138
	_, err = p.Wait(0)
138
	_, err = p.Wait(0)
18
139
	if e, ok := err.(*os.SyscallError); ok && e.Errno == os.ECHILD || err == os.ECHILD {
139
	if e, ok := err.(*os.SyscallError); ok && e.Err == os.ECHILD {
19
140
		// If we can't wait for the server, it's possible that it was running
140
		// If we can't wait for the server, it's possible that it was running
20
141
		// but not as a child of this process, so the only thing we can do
141
		// but not as a child of this process, so the only thing we can do
21
142
		// is to poll until it exits. If the process has taken longer than
142
		// is to poll until it exits. If the process has taken longer than
Status:	Merged
Merged at revision:	27
Proposed branch:	lp:~niemeyer/gozk/fix-weekly
Merge into:	lp:gozk/zookeeper
Diff against target:	21 lines (+2/-2) 1 file modified runserver.go (+2/-2)
To merge this branch:	bzr merge lp:~niemeyer/gozk/fix-weekly
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
The Go Language Gophers		2012-02-15	Pending
Review via email: mp+93198@code.launchpad.net
1	=== modified file 'runserver.go'
2	--- runserver.go 2011-12-05 19:15:00 +0000
3	+++ runserver.go 2012-02-15 13:33:18 +0000
4	@@ -48,7 +48,7 @@
5	48		48
6	49	// try to check if the process is actually running by sending	49	// try to check if the process is actually running by sending
7	50	// it signal 0.	50	// it signal 0.
9	51	err = p.Signal(os.UnixSignal(0))	51	err = p.Signal(syscall.Signal(0))
10	52	if err == nil {	52	if err == nil {
11	53	return p, nil	53	return p, nil
12	54	}	54	}
13	@@ -136,7 +136,7 @@
14	136	// anyway or that we can't wait for it for some other reason,	136	// anyway or that we can't wait for it for some other reason,
15	137	// for example because it was originally started by some other process.	137	// for example because it was originally started by some other process.
16	138	_, err = p.Wait(0)	138	_, err = p.Wait(0)
18	139	if e, ok := err.(*os.SyscallError); ok && e.Errno == os.ECHILD \|\| err == os.ECHILD {	139	if e, ok := err.(*os.SyscallError); ok && e.Err == os.ECHILD {
19	140	// If we can't wait for the server, it's possible that it was running	140	// If we can't wait for the server, it's possible that it was running
20	141	// but not as a child of this process, so the only thing we can do	141	// but not as a child of this process, so the only thing we can do
21	142	// is to poll until it exits. If the process has taken longer than	142	// is to poll until it exits. If the process has taken longer than