Merge pull request #53 from nodes-vapor/feature/beta-2

Feature/beta 2

Author: siemensikkema

README.md

@@ -72,14 +72,6 @@ reporter.report(
 )
 ```
 
-Reporting an error returns a discardable future. Just map/flatMap the result if you would like to do more work after the report has been sent.
-
-```swift
-return reporter.error(yourError, on: req).flatMap {
-    ...
-}
-```
-
 #### Users
 Conforming your `Authenticatable` model to `BugsnagReportableUser` allows you to easily pair the data to a report. The protocol requires your model to have an `id` field that is `CustomStringConvertible`.
 
@@ -121,4 +113,4 @@ The package owner for this project is [Siemen](https://github.com/siemensikkema)
 
 ## 📄 License
 
-This package is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT).
+This package is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT).

Sources/Bugsnag/BugsnagMiddleware.swift

@@ -10,8 +10,9 @@ extension BugsnagMiddleware: Middleware {
         return Future.flatMap(on: req) {
                 try next.respond(to: req)
             }.catchFlatMap { error in
-                self.reporter.report(error, on: req)
-                throw error
+                self.reporter
+                    .report(error, on: req)
+                    .map { throw error }
             }
     }
 }

Sources/Bugsnag/BugsnagProvider.swift

@@ -8,6 +8,7 @@ public final class BugsnagProvider: Provider {
     }
 
     public func register(_ services: inout Services) throws {
+        services.register(BugsnagMiddleware.self)
         services.register(BugsnagReporter(config: config), as: ErrorReporter.self)
         services.register { container in
             return BreadcrumbContainer()

Sources/Bugsnag/ErrorReporter.swift

@@ -1,7 +1,6 @@
 import Vapor
 
 public protocol ErrorReporter {
-    @discardableResult
     func report(
         _ error: Error,
         severity: Severity,
@@ -16,7 +15,6 @@ public protocol ErrorReporter {
 }
 
 extension ErrorReporter {
-    @discardableResult
     func report(
         _ error: Error,
         severity: Severity = .error,
@@ -41,7 +39,6 @@ extension ErrorReporter {
         )
     }
 
-    @discardableResult
     func report<U: BugsnagReportableUser>(
         _ error: Error,
         severity: Severity = .error,
@@ -68,4 +65,3 @@ extension ErrorReporter {
         }
     }
 }
-