From e9ee9ea2e9c8eb8185b8fd5dbe2f74d4da90ab33 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 9 Mar 2021 12:40:00 -0800
Subject: [PATCH] Fixed rollbar integration

---
 app/Providers/AppServiceProvider.php |  2 +-
 config/logging.php                   | 20 ++++++++++++++++++--
 config/services.php                  |  4 ----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index c4f5c731d1..330d9738a0 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -52,7 +52,7 @@ class AppServiceProvider extends ServiceProvider
     public function register()
     {
 
-        if (($this->app->environment('production'))  && (config('services.rollbar.access_token'))){
+        if (($this->app->environment('production'))  && (config('logging.channels.rollbar.access_token'))){
             $this->app->register(\Rollbar\Laravel\RollbarServiceProvider::class);
         }
 
diff --git a/config/logging.php b/config/logging.php
index b57af6ade6..db3cfcfe02 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -2,7 +2,8 @@
 
 use Monolog\Handler\StreamHandler;
 
-return [
+
+$config = [
 
     /*
     |--------------------------------------------------------------------------
@@ -15,7 +16,7 @@ return [
     |
     */
 
-    'default' => env('LOG_CHANNEL', 'stack'),
+    'default' => 'stack',
 
     /*
     |--------------------------------------------------------------------------
@@ -51,6 +52,14 @@ return [
             'days' =>  env('APP_LOG_MAX_FILES', 5),
         ],
 
+        'rollbar' => [
+            'driver' => 'monolog',
+            'handler' => \Rollbar\Laravel\MonologHandler::class,
+            'access_token' => env('ROLLBAR_TOKEN'),
+            'level' => env('APP_LOG_LEVEL', 'debug'),
+        ],
+
+
         'slack' => [
             'driver' => 'slack',
             'url' => env('LOG_SLACK_WEBHOOK_URL'),
@@ -85,3 +94,10 @@ return [
     ],
 
 ];
+
+if ((env('APP_ENV')=='production')  && env('ROLLBAR_TOKEN')) {
+    array_push($config['channels']['stack']['channels'], 'rollbar');
+}
+
+
+return $config;
diff --git a/config/services.php b/config/services.php
index aaccc92c2d..401cfe06d3 100644
--- a/config/services.php
+++ b/config/services.php
@@ -50,10 +50,6 @@ return [
         'stripe_id'    => env('STUNNING_STRIPE_ID'),
     ],
 
-    'rollbar' => [
-        'access_token' => env('ROLLBAR_TOKEN'),
-        'level' => env('ROLLBAR_LEVEL', 'error'),
-    ],
 
     'google' => [
         'maps_api_key' => env('GOOGLE_MAPS_API')