Merge pull request #64 from inf-rno/master

patrickmn · web-flow · commit a3647f8e31d7 · 2017-07-22T00:01:10.000-04:00
Fix janitor stop channel data race
diff --git a/cache.go b/cache.go
@@ -1074,7 +1074,6 @@ type janitor struct {
 }
 
 func (j *janitor) Run(c *cache) {
-	j.stop = make(chan bool)
 	ticker := time.NewTicker(j.Interval)
 	for {
 		select {
@@ -1094,6 +1093,7 @@ func stopJanitor(c *Cache) {
 func runJanitor(c *cache, ci time.Duration) {
 	j := &janitor{
 		Interval: ci,
+		stop:     make(chan bool),
 	}
 	c.janitor = j
 	go j.Run(c)

Original file line number	Diff line number	Diff line change
`@@ -1074,7 +1074,6 @@ type janitor struct {`
`1074`	`1074`	`}`
`1075`	`1075`
`1076`	`1076`	`func (j janitor) Run(c cache) {`
`1077`		`- j.stop = make(chan bool)`
`1078`	`1077`	`ticker := time.NewTicker(j.Interval)`
`1079`	`1078`	`for {`
`1080`	`1079`	`select {`
`@@ -1094,6 +1093,7 @@ func stopJanitor(c *Cache) {`
`1094`	`1093`	`func runJanitor(c *cache, ci time.Duration) {`
`1095`	`1094`	`j := &janitor{`
`1096`	`1095`	`Interval: ci,`
	`1096`	`+ stop: make(chan bool),`
`1097`	`1097`	`}`
`1098`	`1098`	`c.janitor = j`
`1099`	`1099`	`go j.Run(c)`