From 32af34102febe275dc6e97b0a4cc1c7631a665e4 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Wed, 18 Apr 2018 17:35:53 +0200 Subject: [PATCH 1/2] Fixed the paths of the Monolog config files --- logging.rst | 6 +++--- logging/channels_handlers.rst | 4 ++-- logging/processors.rst | 2 +- reference/configuration/monolog.rst | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/logging.rst b/logging.rst index 8a0cd772b61..cf7ce0df967 100644 --- a/logging.rst +++ b/logging.rst @@ -74,7 +74,7 @@ to write logs using the :phpfunction:`syslog` function: .. code-block:: yaml - # config/packages/monolog.yaml + # config/packages/prod/monolog.yaml monolog: handlers: # this "file_log" key could be anything @@ -150,7 +150,7 @@ one of the messages reaches an ``action_level``. Take this example: .. code-block:: yaml - # config/packages/monolog.yaml + # config/packages/prod/monolog.yaml monolog: handlers: filter_for_errors: @@ -264,7 +264,7 @@ option of your handler to ``rotating_file``: .. code-block:: yaml - # config/packages/dev/monolog.yaml + # config/packages/prod/monolog.yaml monolog: handlers: main: diff --git a/logging/channels_handlers.rst b/logging/channels_handlers.rst index d0b05d57333..468976e0d7d 100644 --- a/logging/channels_handlers.rst +++ b/logging/channels_handlers.rst @@ -31,7 +31,7 @@ from the ``security`` channel: .. code-block:: yaml - # config/packages/monolog.yaml + # config/packages/prod/monolog.yaml monolog: handlers: security: @@ -137,7 +137,7 @@ You can also configure additional channels without the need to tag your services .. code-block:: yaml - # config/packages/monolog.yaml + # config/packages/prod/monolog.yaml monolog: channels: ['foo', 'bar'] diff --git a/logging/processors.rst b/logging/processors.rst index a0aed56d5ac..bf92e9232fd 100644 --- a/logging/processors.rst +++ b/logging/processors.rst @@ -109,7 +109,7 @@ Finally, set the formatter to be used on whatever handler you want: .. code-block:: yaml - # config/packages/monolog.yaml + # config/packages/prod/monolog.yaml monolog: handlers: main: diff --git a/reference/configuration/monolog.rst b/reference/configuration/monolog.rst index 5ecda0c31db..b1b1ef88238 100644 --- a/reference/configuration/monolog.rst +++ b/reference/configuration/monolog.rst @@ -14,7 +14,7 @@ Full Default Configuration .. code-block:: yaml - # config/packages/monolog.yaml + # config/packages/prod/monolog.yaml monolog: handlers: From d9bd63461fa0b145f04bc5c1d4d70ef9ffc97d1f Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Sun, 22 Apr 2018 13:20:00 +0200 Subject: [PATCH 2/2] Update the paths for the XML and PHP formats too --- logging.rst | 12 ++++++------ logging/channels_handlers.rst | 8 ++++---- logging/processors.rst | 4 ++-- reference/configuration/monolog.rst | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/logging.rst b/logging.rst index cf7ce0df967..dd4d8a87c62 100644 --- a/logging.rst +++ b/logging.rst @@ -92,7 +92,7 @@ to write logs using the :phpfunction:`syslog` function: .. code-block:: xml - + loadFromExtension('monolog', array( 'handlers' => array( 'file_log' => array( @@ -171,7 +171,7 @@ one of the messages reaches an ``action_level``. Take this example: .. code-block:: xml - + loadFromExtension('monolog', array( 'handlers' => array( 'filter_for_errors' => array( @@ -277,7 +277,7 @@ option of your handler to ``rotating_file``: .. code-block:: xml - + loadFromExtension('monolog', array( 'handlers' => array( 'main' => array( diff --git a/logging/channels_handlers.rst b/logging/channels_handlers.rst index 468976e0d7d..b018e90b496 100644 --- a/logging/channels_handlers.rst +++ b/logging/channels_handlers.rst @@ -48,7 +48,7 @@ from the ``security`` channel: .. code-block:: xml - + loadFromExtension('monolog', array( 'handlers' => array( 'security' => array( @@ -143,7 +143,7 @@ You can also configure additional channels without the need to tag your services .. code-block:: xml - + loadFromExtension('monolog', array( 'channels' => array( 'foo', diff --git a/logging/processors.rst b/logging/processors.rst index bf92e9232fd..d78bd00457f 100644 --- a/logging/processors.rst +++ b/logging/processors.rst @@ -120,7 +120,7 @@ Finally, set the formatter to be used on whatever handler you want: .. code-block:: xml - + loadFromExtension('monolog', array( 'handlers' => array( 'main' => array( diff --git a/reference/configuration/monolog.rst b/reference/configuration/monolog.rst index b1b1ef88238..79dfbaf96f8 100644 --- a/reference/configuration/monolog.rst +++ b/reference/configuration/monolog.rst @@ -80,7 +80,7 @@ Full Default Configuration .. code-block:: xml - +