Some sentry fixes.

Sentry can only capture panics from the current goroutine getsentry/raven-go#95 with makes wrapping pusher.start in capturePanic useless.

README.md

@@ -180,3 +180,7 @@ The GCM library we're using requires that we specify a ping interval and timeout
 GCM supports at most 100 pending messages (see [Flow Control section](https://developers.google.com/cloud-messaging/ccs#flow) in GCM documentation).
 
 * `PUSHER_GCM_MAXPENDINGMESSAGES` - Max pending messages;
+
+If you wish Sentry integration simply set the following environment variable:
+
+* `PUSHER_SENTRY_URL` - Sentry Client Key (DSN);

cmd/apns.go

@@ -76,23 +76,21 @@ var apnsCmd = &cobra.Command{
 		if err != nil {
 			panic(err)
 		}
-		apnsPusher, err := startApns(debug, json, production, certificate, config, nil, nil, nil)
-		if err != nil {
-			panic(err)
-		}
 
 		sentryURL := config.GetString("sentry.url")
-		if sentryURL == "" {
-			apnsPusher.Start()
-		} else {
+		if sentryURL != "" {
 			raven.SetDSN(sentryURL)
-			raven.CapturePanic(func() {
-				apnsPusher.Start()
-			}, map[string]string{
+		}
+
+		apnsPusher, err := startApns(debug, json, production, certificate, config, nil, nil, nil)
+		if err != nil {
+			raven.CaptureErrorAndWait(err, map[string]string{
 				"version": util.Version,
 				"cmd":     "apns",
 			})
+			panic(err)
 		}
+		apnsPusher.Start()
 	},
 }
 

cmd/gcm.go

@@ -82,23 +82,20 @@ var gcmCmd = &cobra.Command{
 			panic(err)
 		}
 
-		gcmPusher, err := startGcm(debug, json, production, senderID, apiKey, config, nil, nil, nil)
-		if err != nil {
-			panic(err)
-		}
-
 		sentryURL := config.GetString("sentry.url")
-		if sentryURL == "" {
-			gcmPusher.Start()
-		} else {
+		if sentryURL != "" {
 			raven.SetDSN(sentryURL)
-			raven.CapturePanic(func() {
-				gcmPusher.Start()
-			}, map[string]string{
+		}
+
+		gcmPusher, err := startGcm(debug, json, production, senderID, apiKey, config, nil, nil, nil)
+		if err != nil {
+			raven.CaptureErrorAndWait(err, map[string]string{
 				"version": util.Version,
 				"cmd":     "gcm",
 			})
+			panic(err)
 		}
+		gcmPusher.Start()
 	},
 }
 

docs/hosting.md

@@ -64,6 +64,10 @@ GCM supports at most 100 pending messages (see [Flow Control section](https://de
 
 * `PUSHER_GCM_MAXPENDINGMESSAGES` - Max pending messages;
 
+If you wish Sentry integration simply set the following environment variable:
+
+* `PUSHER_SENTRY_URL` - Sentry Client Key (DSN);
+
 ### Example command for running with Docker
 
 ```