From 2305589cd72f2e781ad0f8d9482ccabd12d76eca Mon Sep 17 00:00:00 2001 From: alpha Date: Sun, 19 Aug 2018 07:29:56 +0800 Subject: [PATCH 1/4] fix ch4-04-3 --- ch4-rpc/ch4-04-grpc.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ch4-rpc/ch4-04-grpc.md b/ch4-rpc/ch4-04-grpc.md index f8e8604..20489f5 100644 --- a/ch4-rpc/ch4-04-grpc.md +++ b/ch4-rpc/ch4-04-grpc.md @@ -217,6 +217,10 @@ for { ```go import ( "github.com/docker/docker/pkg/pubsub" + "time" + "fmt" + "strings" + "runtime" ) func main() { @@ -224,7 +228,7 @@ func main() { golang := p.SubscribeTopic(func(v interface{}) bool { if key, ok := v.(string); ok { - if strings.Hasprefix("golang:") { + if strings.HasPrefix(key,"golang:") { return true } } @@ -232,7 +236,7 @@ func main() { }) docker := p.SubscribeTopic(func(v interface{}) bool { if key, ok := v.(string); ok { - if strings.Hasprefix("docker:") { + if strings.HasPrefix(key,"docker:") { return true } } @@ -250,8 +254,10 @@ func main() { go func () { fmt.Println("docker topic:", <-docker) } () + for { + runtime.Gosched() + } - <-make(chan bool) } ``` From 78c55bd85b7e3020dd40dcea66315bc698c87e68 Mon Sep 17 00:00:00 2001 From: alpha Date: Sun, 19 Aug 2018 08:48:09 +0800 Subject: [PATCH 2/4] fix ch4-04-3 --- ch4-rpc/ch4-04-grpc.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ch4-rpc/ch4-04-grpc.md b/ch4-rpc/ch4-04-grpc.md index 20489f5..dbad0f6 100644 --- a/ch4-rpc/ch4-04-grpc.md +++ b/ch4-rpc/ch4-04-grpc.md @@ -217,10 +217,6 @@ for { ```go import ( "github.com/docker/docker/pkg/pubsub" - "time" - "fmt" - "strings" - "runtime" ) func main() { From a501fccacddf94fc079cacb63ca23444c2061bb2 Mon Sep 17 00:00:00 2001 From: alpha Date: Sun, 19 Aug 2018 23:51:32 +0800 Subject: [PATCH 3/4] fix ch4-04-3 --- ch4-rpc/ch4-04-grpc.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ch4-rpc/ch4-04-grpc.md b/ch4-rpc/ch4-04-grpc.md index dbad0f6..265be5a 100644 --- a/ch4-rpc/ch4-04-grpc.md +++ b/ch4-rpc/ch4-04-grpc.md @@ -250,10 +250,8 @@ func main() { go func () { fmt.Println("docker topic:", <-docker) } () - for { - runtime.Gosched() - } + <-make(chan bool) } ``` From 3fa1e4f59253775e6d237eab90a4a74baddfc452 Mon Sep 17 00:00:00 2001 From: alpha Date: Mon, 20 Aug 2018 09:22:00 +0800 Subject: [PATCH 4/4] fix ch4-04-3 --- ch4-rpc/ch4-04-grpc.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ch4-rpc/ch4-04-grpc.md b/ch4-rpc/ch4-04-grpc.md index 265be5a..ca5df04 100644 --- a/ch4-rpc/ch4-04-grpc.md +++ b/ch4-rpc/ch4-04-grpc.md @@ -224,7 +224,7 @@ func main() { golang := p.SubscribeTopic(func(v interface{}) bool { if key, ok := v.(string); ok { - if strings.HasPrefix(key,"golang:") { + if strings.HasPrefix(key, "golang:") { return true } } @@ -232,7 +232,7 @@ func main() { }) docker := p.SubscribeTopic(func(v interface{}) bool { if key, ok := v.(string); ok { - if strings.HasPrefix(key,"docker:") { + if strings.HasPrefix(key, "docker:") { return true } } @@ -244,12 +244,12 @@ func main() { go p.Publish("docker: https://www.docker.com/") time.Sleep(1) - go func () { + go func() { fmt.Println("golang topic:", <-golang) - } () - go func () { + }() + go func() { fmt.Println("docker topic:", <-docker) - } () + }() <-make(chan bool) }