Merge pull request #11562 from uberbrady/clarify_logging

Fixed inconsistent `*_LOG_LEVEL` variables; set reasonable defaults

.env.docker

@@ -155,8 +155,8 @@ RESET_PASSWORD_LINK_EXPIRES=900
 # --------------------------------------------
 # OPTIONAL: MISC
 # --------------------------------------------
-APP_LOG=stderr
+LOG_CHANNEL=stderr
-APP_LOG_MAX_FILES=10
+LOG_MAX_DAYS=10
 APP_LOCKED=false
 APP_CIPHER=AES-256-CBC
 GOOGLE_MAPS_API=

.env.dusk.local

@@ -93,7 +93,7 @@ DISABLE_NOSAML_LOCAL_LOGIN=true
 # --------------------------------------------
 # OPTIONAL: MISC
 # --------------------------------------------
-APP_LOG=single
+LOG_CHANNEL=single
 LOG_LEVEL=debug
 LOG_CHANNEL=stack
 LOG_SLACK_WEBHOOK_URL=null

.env.example

@@ -158,8 +158,8 @@ PASSWORD_RESET_MAX_ATTEMPTS_PER_MIN=50
 # --------------------------------------------
 # OPTIONAL: MISC
 # --------------------------------------------
-APP_LOG=single
+LOG_CHANNEL=single
-APP_LOG_MAX_FILES=10
+LOG_MAX_DAYS=10
 APP_LOCKED=false
 APP_CIPHER=AES-256-CBC
 APP_FORCE_TLS=false

.env.testing

@@ -70,5 +70,5 @@ SECURE_COOKIES=false
 # --------------------------------------------
 # OPTIONAL: APP LOG FORMAT
 # --------------------------------------------
-APP_LOG=single
+LOG_CHANNEL=single
-APP_LOG_LEVEL=debug
+LOG_LEVEL=debug

.env.testing-ci

@@ -34,4 +34,4 @@ IMAGE_LIB=gd
 # --------------------------------------------
 # OPTIONAL: APP LOG FORMAT
 # --------------------------------------------
-APP_LOG=single
+LOG_CHANNEL=single

app.json

@@ -118,7 +118,7 @@
         "description": "The duration (in seconds) that the user should be blocked from attempting to authenticate again.",
         "value": "60"
       },
-      "APP_LOG": {
+      "LOG_CHANNEL": {
         "description": "Driver to send logs to. (errorlog for stderr)",
         "value": "errorlog"
       },

config/app.php

@@ -129,55 +129,6 @@ return [
 
     'cipher' =>  env('APP_CIPHER', 'AES-256-CBC'),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Logging Configuration
-    |--------------------------------------------------------------------------
-    |
-    | Here you may configure the log settings for your application. Out of
-    | the box, Laravel uses the Monolog PHP logging library. This gives
-    | you a variety of powerful log handlers / formatters to utilize.
-    |
-    | Available Settings: "single", "daily", "syslog", "errorlog"
-    |
-    */
-
-    'log' => env('APP_LOG', 'single'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Logging Max Files
-    |--------------------------------------------------------------------------
-    |
-    | When using the daily log mode, Laravel will only retain 5
-    | days of log files by default.
-    |
-    | To change this, set the APP_LOG_MAX_FILES option in your .env.
-    |
-    */
-
-    'log_max_files' => env('APP_LOG_MAX_FILES', 5),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Logging Detail
-    |--------------------------------------------------------------------------
-    |
-    | By default, Laravel writes all log levels to storage. However, in your
-    | production environment, you may wish to configure the minimum severity that
-    | should be logged by editing your APP_LOG_LEVEL env config.
-    |
-    | Laravel will log all levels greater than or equal to the specified severity.
-    | For example, a default log_level of error will log error, critical, alert,
-    | and emergency messages.
-    |
-    | APP_LOG_LEVEL options are:
-    | "debug", "info", "notice", "warning", "error", "critical", "alert", "emergency"
-    |
-    */
-
-    'log_level' => env('APP_LOG_LEVEL', 'error'),
-
     /*
     |--------------------------------------------------------------------------
     | Default Storage path for private uploads

config/logging.php

@@ -44,14 +44,14 @@ return [
         'single' => [
             'driver' => 'single',
             'path' => storage_path('logs/laravel.log'),
-            'level' => env('LOG_LEVEL', 'debug'),
+            'level' => env('LOG_LEVEL', 'warning'),
         ],
 
         'daily' => [
             'driver' => 'daily',
             'path' => storage_path('logs/laravel.log'),
-            'level' => env('LOG_LEVEL', 'debug'),
+            'level' => env('LOG_LEVEL', 'warning'),
-            'days' => 14,
+            'days' => env('LOG_MAX_DAYS', 14),
         ],
 
         'slack' => [
@@ -64,7 +64,7 @@ return [
 
         'papertrail' => [
             'driver' => 'monolog',
-            'level' => env('LOG_LEVEL', 'debug'),
+            'level' => env('LOG_LEVEL', 'warning'),
             'handler' => SyslogUdpHandler::class,
             'handler_with' => [
                 'host' => env('PAPERTRAIL_URL'),
@@ -74,7 +74,7 @@ return [
 
         'stderr' => [
             'driver' => 'monolog',
-            'level' => env('LOG_LEVEL', 'debug'),
+            'level' => env('LOG_LEVEL', 'warning'),
             'handler' => StreamHandler::class,
             'formatter' => env('LOG_STDERR_FORMATTER'),
             'with' => [
@@ -84,12 +84,12 @@ return [
 
         'syslog' => [
             'driver' => 'syslog',
-            'level' => env('LOG_LEVEL', 'debug'),
+            'level' => env('LOG_LEVEL', 'warning'),
         ],
 
         'errorlog' => [
             'driver' => 'errorlog',
-            'level' => env('LOG_LEVEL', 'debug'),
+            'level' => env('LOG_LEVEL', 'warning'),
         ],
 
         'null' => [