Merge pull request #20 from guanguans/issue-19-Job错误

Author: guanguans

config/exception-notify.php

@@ -212,7 +212,7 @@
         // Log
         'log' => [
             'driver' => 'log',
-            'channel' => env('EXCEPTION_NOTIFY_LOG_CHANNEL', config('logging.default')),
+            'channel' => env('EXCEPTION_NOTIFY_LOG_CHANNEL', config('logging.default', 'stack')),
             'level' => env('EXCEPTION_NOTIFY_LOG_LEVEL', 'error'),
             'pipeline' => [],
         ],

src/ExceptionNotifyManager.php

@@ -74,7 +74,6 @@ public function report(Throwable $e)
             }
 
             $this->registerException($e);
-            $this->registerReportExceptionJobMethod();
             $this->dispatchReportExceptionJob();
         } catch (Throwable $e) {
             $this->container['log']->error($e->getMessage(), ['exception' => $e]);
@@ -100,9 +99,10 @@ function (ShouldQueue $job, Container $container) {
 
     protected function dispatchReportExceptionJob()
     {
+        $report = (string) $this->container->make(CollectorManager::class);
         $drivers = $this->getDrivers() ?: Arr::wrap($this->driver());
         foreach ($drivers as $driver) {
-            $dispatch = dispatch(ReportExceptionJob::create($driver));
+            $dispatch = dispatch(ReportExceptionJob::create($driver, $report));
 
             'sync' === $this->container['config']['queue.default'] and
             method_exists($dispatch, 'afterResponse') and $dispatch->afterResponse();

src/Jobs/ReportExceptionJob.php

@@ -56,14 +56,20 @@ class ReportExceptionJob implements ShouldQueue
      */
     protected $channel;
 
-    public function __construct(Channel $channel)
+    /**
+     * @var string
+     */
+    protected $report;
+
+    public function __construct(Channel $channel, string $report)
     {
         $this->channel = $channel;
+        $this->report = $report;
     }
 
-    public function handle(string $report)
+    public function handle()
     {
-        $pipedReport = $this->pipelineReport($report);
+        $pipedReport = $this->pipelineReport($this->report);
 
         $this->fireReportingEvent($pipedReport);
         $result = $this->channel->report($pipedReport);