From eb964569095cf1ab786e476ca129a50e289c91ca Mon Sep 17 00:00:00 2001
From: Brad Rydzewski <brad.rydzewski@gmail.com>
Date: Thu, 18 Oct 2018 22:33:56 -0700
Subject: [PATCH] fix for #2480

---
 .drone.yml         | 4 ++--
 server/stream.go   | 3 +++
 version/version.go | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e369ea167..9024cfd2d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -118,7 +118,7 @@ pipeline:
     image: plugins/docker
     repo: drone/drone
     secrets: [ docker_username, docker_password ]
-    tag: [ 0.8, 0.8.6 ]
+    tag: [ 0.8, 0.8.7 ]
     when:
       event: tag
 
@@ -127,7 +127,7 @@ pipeline:
     repo: drone/agent
     dockerfile: Dockerfile.agent
     secrets: [ docker_username, docker_password ]
-    tag: [ 0.8, 0.8.6 ]
+    tag: [ 0.8, 0.8.7 ]
     when:
       event: tag
 
diff --git a/server/stream.go b/server/stream.go
index 6dd19a9ba..5856044ee 100644
--- a/server/stream.go
+++ b/server/stream.go
@@ -188,6 +188,9 @@ func LogStreamSSE(c *gin.Context) {
 	go func() {
 		// TODO remove global variable
 		Config.Services.Logs.Tail(ctx, fmt.Sprint(proc.ID), func(entries ...*logging.Entry) {
+			defer func() {
+				recover() // fix #2480
+			}()
 			for _, entry := range entries {
 				select {
 				case <-ctx.Done():
diff --git a/version/version.go b/version/version.go
index f30bd06ae..4070a7298 100644
--- a/version/version.go
+++ b/version/version.go
@@ -22,7 +22,7 @@ var (
 	// VersionMinor is for functionality in a backwards-compatible manner.
 	VersionMinor int64 = 8
 	// VersionPatch is for backwards-compatible bug fixes.
-	VersionPatch int64 = 6
+	VersionPatch int64 = 7
 	// VersionPre indicates prerelease.
 	VersionPre string
 	// VersionDev indicates development branch. Releases will be empty string.