Merge pull request #318 from aandryashin/master

Avoid close on closed channel
aerokube · Dec 22, 2017 · dc503b7 · dc503b7
2 parents ad8a78c + 9904947
commit dc503b7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/selenoid.go b/selenoid.go
@@ -356,7 +356,11 @@ func proxy(w http.ResponseWriter, r *http.Request) {
 				if ok {
 					sess.Lock.Lock()
 					defer sess.Lock.Unlock()
-					close(sess.Timeout)
+					select {
+					case <-sess.Timeout:
+					default:
+						close(sess.Timeout)
+					}
 					if r.Method == http.MethodDelete && len(fragments) == 3 {
 						if enableFileUpload {
 							os.RemoveAll(filepath.Join(os.TempDir(), id))