Solving conflicts updating with last changes in develop branch

2020-12-03 20:19:49 +00:00
parent ebc8e61d8c 098acc57a2
commit bb935e1637
66 changed files with 3721 additions and 1224 deletions
--- a/config/logging.php
+++ b/config/logging.php
@@ -61,6 +61,14 @@ return [
            'level' => 'debug',
            'days' => $app->make('config')->get('app.log_max_files', 60),
        ],
+        
+        'taskScheduler' => [
+            'driver' => 'daily',
+            'tap' => [App\Logging\CustomizeFormatter::class],
+            'path' => storage_path('logs/taskScheduler.log'),
+            'level' => 'debug',
+            'days' => $app->make('config')->get('app.log_max_files', 60),
+        ],

        'slack' => [
            'driver' => 'slack',