Merge remote-tracking branch 'remotes/dev/4.2' into 4.2

oroinc · Apr 6, 2021 · 7f5c0e6 · 7f5c0e6
2 parents c94b978 + d114cc8
commit 7f5c0e6
Show file tree

Hide file tree

Showing 7 changed files with 443 additions and 244 deletions.
diff --git a/3rd-party-dependencies.md b/3rd-party-dependencies.md
@@ -345,6 +345,7 @@ THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR I
 |@oroinc/jsplumb|https://github.com/sporritt/jsPlumb/blob/master/README.md|https://github.com/sporritt/jsPlumb||
 |@oroinc/oro-webpack-config-builder|https://npmjs.com/package/@oroinc/oro-webpack-config-builder/blob/master/LICENSE|https://npmjs.com/package/@oroinc/oro-webpack-config-builder|Copyright (c) 2013, Oro, Inc.|
 |@oroinc/select2|https://github.com/select2/select2/blob/master/LICENSE|https://github.com/select2/select2|Copyright 2012 Igor Vaynberg|
+|@romainberger/css-diff|https://github.com/romainberger/css-diff/blob/master/LICENSE.md|https://github.com/romainberger/css-diff|Copyright (c) Romain Berger <romain@romainberger.com>|
 |@types/glob|https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/LICENSE|https://github.com/DefinitelyTyped/DefinitelyTyped|Copyright (c) Microsoft Corporation.|
 |@types/json-schema|https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/LICENSE|https://github.com/DefinitelyTyped/DefinitelyTyped|Copyright (c) Microsoft Corporation.|
 |@types/minimatch|https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/LICENSE|https://github.com/DefinitelyTyped/DefinitelyTyped|Copyright (c) Microsoft Corporation. All rights reserved.|
@@ -647,6 +648,7 @@ THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR I
 |find-cache-dir|https://github.com/avajs/find-cache-dir/blob/master/license|https://github.com/avajs/find-cache-dir|Copyright (c) Sindre Sorhus &lt;sindresorhus@gmail.com&gt; (https://sindresorhus.com)|
 |find-up|https://github.com/sindresorhus/find-up/blob/master/license|https://github.com/sindresorhus/find-up|Copyright (c) Sindre Sorhus &lt;sindresorhus@gmail.com&gt; (sindresorhus.com)|
 |findup-sync|https://github.com/gulpjs/findup-sync/blob/master/LICENSE|https://github.com/gulpjs/findup-sync|Copyright (c) 2013-2018 Ben Alman &lt;cowboy@rj3.net&gt;, Blaine Bublitz &lt;blaine.bublitz@gmail.com&gt;, and Eric Schoffstall &lt;yo@contra.io&gt;|
+|findup|https://github.com/Filirom1/findup/blob/master/package.json|https://github.com/Filirom1/findup|Copyright (c) Filirom1 <filirom1@gmail.com>|
 |flat-cache|https://github.com/royriojas/flat-cache/blob/master/LICENSE|https://github.com/royriojas/flat-cache|Copyright (c) 2015 Roy Riojas|
 |flotr2|https://github.com/HumbleSoftware/Flotr2/blob/master/LICENSE|https://github.com/HumbleSoftware/Flotr2|Copyright (c) 2012 Carl Sutherland|
 |flush-write-stream|https://github.com/mafintosh/flush-write-stream/blob/master/LICENSE|https://github.com/mafintosh/flush-write-stream|Copyright (c) 2015 Mathias Buus|
@@ -1075,6 +1077,7 @@ THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR I
 |rgb-regex|https://github.com/regexps/rgb-regex/blob/master/LICENSE.md|https://github.com/regexps/rgb-regex|Copyright (c) 2015 John Otander|
 |rgba-regex|https://github.com/johnotander/rgba-regex/blob/master/LICENSE.md|https://github.com/johnotander/rgba-regex|Copyright (c) 2015 John Otander|
 |ripemd160|https://github.com/crypto-browserify/ripemd160/blob/master/LICENSE|https://github.com/crypto-browserify/ripemd160|Copyright (c) 2016 crypto-browserify|
+|rtlcss|https://github.com/MohammadYounes/rtlcss/blob/master/LICENSE|https://github.com/MohammadYounes/rtlcss|Copyright (c) Mohammad Younes|
 |run-async|https://github.com/SBoudrias/run-async/blob/master/LICENSE|https://github.com/SBoudrias/run-async|Copyright (c) 2014 Simon Boudrias|
 |safe-buffer|https://github.com/feross/safe-buffer/blob/master/LICENSE|https://github.com/feross/safe-buffer|Copyright (c) Feross Aboukhadijeh|
 |safe-regex|https://github.com/substack/safe-regex/blob/master/LICENSE|https://github.com/substack/safe-regex||
@@ -1284,9 +1287,11 @@ THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR I
 |webpack-dev-server|https://github.com/webpack/webpack-dev-server/blob/master/LICENSE|https://github.com/webpack/webpack-dev-server|Copyright JS Foundation and other contributors|
 |webpack-log|https://github.com/webpack-contrib/webpack-log/blob/master/LICENSE|https://github.com/webpack-contrib/webpack-log|Copyright (c) 2017 webpack-contrib|
 |webpack-merge|https://github.com/survivejs/webpack-merge/blob/master/LICENSE|https://github.com/survivejs/webpack-merge|Copyright (c) 2015 Juho Vepsalainen|
+|webpack-rtl-plugin|https://github.com/romainberger/webpack-rtl-plugin/blob/master/LICENSE.md|https://github.com/romainberger/webpack-rtl-plugin|Copyright (c) Romain Berger <romain@romainberger.com>|
 |webpack-sources|https://github.com/webpack/webpack-sources/blob/master/LICENSE|https://github.com/webpack/webpack-sources|Copyright (c) 2017 JS Foundation and other contributors|
 |whatwg-fetch|https://github.com/github/fetch/blob/master/LICENSE|https://github.com/github/fetch|Copyright (c) 2014-2016 GitHub, Inc.|
 |when|https://github.com/cujojs/when/blob/master/LICENSE.txt|https://github.com/cujojs/when|Copyright (c) 2011 Brian Cavalier|
+|wildcard|https://github.com/DamonOehlman/wildcard/blob/master/package.json|https://github.com/DamonOehlman/wildcard|Damon Oehlman <damon.oehlman@gmail.com>|
 |willdurand/jsonp-callback-validator|https://github.com/willdurand/JsonpCallbackValidator/blob/master/LICENSE|https://github.com/willdurand/JsonpCallbackValidator|Copyright (c) 2013 William Durand &lt;william.durand1@gmail.com&gt;|
 |willdurand/negotiation|https://github.com/willdurand/Negotiation/blob/master/LICENSE|https://github.com/willdurand/Negotiation|Copyright (c) William Durand &lt;will+git@drnd.me&gt;|
 |word-wrap|https://github.com/jonschlinkert/word-wrap/blob/master/LICENSE|https://github.com/jonschlinkert/word-wrap|Copyright (c) 2014-2017, Jon Schlinkert|

diff --git a/config/config_dev.yml b/config/config_dev.yml
@@ -20,14 +20,7 @@ monolog:
             type:      stream
             path:      "%kernel.logs_dir%/%kernel.environment%.log"
             level:     debug
-            channels:  '%main_log_channels%'
-
-        # collect all log records to buffer on CLI command error
-        message_queue.consumer.console_error:
-            type:      service
-            id:        oro_message_queue.log.handler.console_error
-            handler:   main
-            level:     debug
+            channels:  '%main_log_channels%' # The channels configuration only works for top-level handlers
 
 oro_message_queue:
     client:

diff --git a/config/config_prod.yml b/config/config_prod.yml
@@ -10,26 +10,30 @@ doctrine:
 
 monolog:
     handlers:
-        detailed_logs:
-            type:           service
-            id:             oro_logger.monolog.detailed_logs.handler
-            handler:        nested
-            channels:       '%main_log_channels%'
-        nested:
+        filtered:
+            type: filter
+            min_level: info
+            handler: main
+            channels: '%main_log_channels%' # The channels configuration only works for top-level handlers
+        main:
+            type: fingers_crossed
+            action_level: error
+            handler: grouped
+            buffer_size:    100
+            excluded_http_codes: [ 404, 405 ]
+        grouped:
+            type: group
+            members: [streamed, deduplicated]
+
+        streamed:
             type:           stream
             path:           "%kernel.logs_dir%/%kernel.environment%.log"
             level:          debug
-            channels:       '%main_log_channels%'
 
-        fingers_crossed:
-            type:           fingers_crossed
-            action_level:   critical
-            handler:        deduplicated
-            buffer_size:    1000
         deduplicated:
             type:           deduplication
             handler:        swift
-            buffer_size:    1000
+            time:           10
         swift:
             type:           swift_mailer
             email_prototype:
@@ -39,9 +43,3 @@ monolog:
             level:          debug
             formatter:      monolog.formatter.html
 
-        # collect all log records to buffer on CLI command error
-        message_queue.consumer.console_error:
-            type:           service
-            id:             oro_message_queue.log.handler.console_error
-            handler:        nested
-            level:          debug
diff --git a/config/deployment/config_local.yml b/config/deployment/config_local.yml
@@ -3,23 +3,20 @@ parameters:
 
 monolog:
     handlers:
+        # collect all log records to buffer on CLI command error
+        consumer_buffer:
+            type: fingers_crossed
+            action_level: error
+            handler: consumer
+            buffer_size: 100
+            channels: [ 'consumer' ]
         # write all records from 'consumer' consumer channel to 'consumer_%kernel.environment%.log'
         consumer:
             type:          rotating_file
             path:          "%kernel.logs_dir%/consumer_%kernel.environment%.log"
             level:         debug
             max_files:     7
-            channels:      ["consumer"]
             nested:        true
-
-        # collect all log records to buffer on CLI command error
-        message_queue.consumer.console_error:
-            type:          service
-            id:            oro_message_queue.log.handler.console_error
-            handler:       consumer
-            level:         debug
-            channels:      ["consumer"]
-
         # only records filtered by verbosity level should pass to `consumer_%kernel.environment%.log` file
         filter_consumer:
             type:          service