Merge pull request getlantern#2900 from getlantern/issue2897

avoid channel state closes #2897
pialin · Aug 9, 2015 · 0585e49 · 0585e49
2 parents b60c229 + 0ba8177
commit 0585e49
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/github.com/getlantern/detour/detour.go b/src/github.com/getlantern/detour/detour.go
@@ -51,7 +51,7 @@ var TimeoutToDetour = 3 * time.Second
 
 // if DirectAddrCh is set, when a direct connection is closed without any error,
 // the connection's remote address (in host:port format) will be send to it
-var DirectAddrCh chan string
+var DirectAddrCh chan string = make(chan string)
 
 var (
 	log = golog.LoggerFor("detour")

diff --git a/src/github.com/getlantern/flashlight/pac.go b/src/github.com/getlantern/flashlight/pac.go
@@ -107,7 +107,6 @@ func genPACFile() {
 
 // watchDirectAddrs adds any site that has accessed directly without error to PAC file
 func watchDirectAddrs() {
-	detour.DirectAddrCh = make(chan string)
 	go func() {
 		for {
 			addr := <-detour.DirectAddrCh