Upgrade to latest Airbrake notifier

zefer · Dec 2, 2016 · e56ab0e · e56ab0e
1 parent b27d69c
commit e56ab0e
Show file tree

Hide file tree

Showing 36 changed files with 1,451 additions and 388 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/handlers/file_list.go b/handlers/file_list.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/zefer/gompd/mpd"
-	"gopkg.in/airbrake/glog.v1"
+	"gopkg.in/airbrake/glog.v2"
 )
 
 type FileLister interface {

diff --git a/handlers/library.go b/handlers/library.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"gopkg.in/airbrake/glog.v1"
+	"gopkg.in/airbrake/glog.v2"
 )
 
 type LibraryUpdater interface {

diff --git a/handlers/next.go b/handlers/next.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"net/http"
 
-	"gopkg.in/airbrake/glog.v1"
+	"gopkg.in/airbrake/glog.v2"
 )
 
 type Nexter interface {

diff --git a/handlers/pause.go b/handlers/pause.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"net/http"
 
-	"gopkg.in/airbrake/glog.v1"
+	"gopkg.in/airbrake/glog.v2"
 )
 
 type Pauser interface {

diff --git a/handlers/play.go b/handlers/play.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"net/http"
 
-	"gopkg.in/airbrake/glog.v1"
+	"gopkg.in/airbrake/glog.v2"
 )
 
 type Player interface {

diff --git a/handlers/playlist.go b/handlers/playlist.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 
 	"github.com/zefer/gompd/mpd"
-	"gopkg.in/airbrake/glog.v1"
+	"gopkg.in/airbrake/glog.v2"
 )
 
 type Playlister interface {

diff --git a/handlers/previous.go b/handlers/previous.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"net/http"
 
-	"gopkg.in/airbrake/glog.v1"
+	"gopkg.in/airbrake/glog.v2"
 )
 
 type Previouser interface {

diff --git a/handlers/random.go b/handlers/random.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"net/http"
 
-	"gopkg.in/airbrake/glog.v1"
+	"gopkg.in/airbrake/glog.v2"
 )
 
 type Randomer interface {

diff --git a/main.go b/main.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	assetfs "github.com/elazarl/go-bindata-assetfs"
-	"gopkg.in/airbrake/glog.v1"
-	"gopkg.in/airbrake/gobrake.v1"
+	"gopkg.in/airbrake/glog.v2"
+	"gopkg.in/airbrake/gobrake.v2"
 
 	"github.com/zefer/mothership/handlers"
 	"github.com/zefer/mothership/mpd"
@@ -25,11 +25,17 @@ var (
 
 func main() {
 	flag.Parse()
+	defer glog.Flush()
 	glog.Infof("Starting API for MPD at %s.", *mpdAddr)
 
 	if *abProjectID > int64(0) && *abApiKey != "" {
 		airbrake := gobrake.NewNotifier(*abProjectID, *abApiKey)
-		airbrake.SetContext("environment", *abEnv)
+		defer airbrake.Close()
+		defer airbrake.NotifyOnPanic()
+		airbrake.AddFilter(func(n *gobrake.Notice) *gobrake.Notice {
+			n.Context["environment"] = *abEnv
+			return n
+		})
 		glog.Gobrake = airbrake
 	}
 

diff --git a/mpd/client.go b/mpd/client.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	gompd "github.com/zefer/gompd/mpd"
-	"gopkg.in/airbrake/glog.v1"
+	"gopkg.in/airbrake/glog.v2"
 )
 
 const retryDur time.Duration = time.Second * 3

diff --git a/mpd/watcher.go b/mpd/watcher.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	gompd "github.com/zefer/gompd/mpd"
-	"gopkg.in/airbrake/glog.v1"
+	"gopkg.in/airbrake/glog.v2"
 )
 
 type watcher struct {

diff --git a/vendor/gopkg.in/airbrake/glog.v1/LICENSE → vendor/github.com/golang/glog/LICENSE b/vendor/gopkg.in/airbrake/glog.v1/LICENSE → vendor/github.com/golang/glog/LICENSE
diff --git a/vendor/gopkg.in/airbrake/glog.v1/README → vendor/github.com/golang/glog/README b/vendor/gopkg.in/airbrake/glog.v1/README → vendor/github.com/golang/glog/README