From 22829f1b2e4ee7748c03104d3b88ccb8effa28d0 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Wed, 25 Sep 2024 09:50:20 +0300 Subject: [PATCH 1/5] remove filelog --- composer.json | 1 - composer.lock | 58 +-------------------------------------------------- 2 files changed, 1 insertion(+), 58 deletions(-) diff --git a/composer.json b/composer.json index 499081dc..9e377b01 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,6 @@ "cweagans/composer-patches": "^1.6.7", "drupal/core": "^10.0", "drupal/core-composer-scaffold": "^10.0", - "drupal/filelog": "^2.1", "drupal/hdbt": "^6.0", "drupal/hdbt_admin": "^3.0", "drupal/helfi_azure_fs": "^2.0", diff --git a/composer.lock b/composer.lock index b64c68dd..ec0f05d8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ea915143da8661b86d0f1ef7eb3d0256", + "content-hash": "b23bf4b4eb4fff5bb6b6e624ab64547f", "packages": [ { "name": "asm89/stack-cors", @@ -3753,62 +3753,6 @@ "source": "https://git.drupalcode.org/project/file_mdm" } }, - { - "name": "drupal/filelog", - "version": "2.1.2", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/filelog.git", - "reference": "2.1.2" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/filelog-2.1.2.zip", - "reference": "2.1.2", - "shasum": "47108fcd13a53fa2cf356434c1d6009892915f8c" - }, - "require": { - "drupal/core": "^9 || ^10", - "ext-zlib": "*", - "php": "^7.4 || ^8" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "2.1.2", - "datestamp": "1721990145", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0+" - ], - "authors": [ - { - "name": "Christoph Burschka", - "homepage": "https://github.com/cburschka", - "email": "christoph@burschka.de", - "role": "Maintainer" - }, - { - "name": "cburschka", - "homepage": "https://www.drupal.org/user/28680" - } - ], - "description": "Logs system events to a file.", - "homepage": "https://www.drupal.org/project/filelog", - "keywords": [ - "Drupal" - ], - "support": { - "source": "https://cgit.drupalcode.org/filelog", - "issues": "https://www.drupal.org/project/issues/filelog" - } - }, { "name": "drupal/flysystem", "version": "2.1.0-rc6", From 728ee607db6194d960a6f1d1f32d31bca46ab50f Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Wed, 25 Sep 2024 09:25:15 +0000 Subject: [PATCH 2/5] Update configuration --- composer.lock | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index ec0f05d8..31baf02c 100644 --- a/composer.lock +++ b/composer.lock @@ -2227,7 +2227,7 @@ "homepage": "https://www.drupal.org/user/157725" }, { - "name": "AstonVictor", + "name": "astonvictor", "homepage": "https://www.drupal.org/user/3466615" }, { @@ -4402,16 +4402,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.6.6", + "version": "4.6.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "ad39a8887983f38dad1de4fae73fc4349730bdf3" + "reference": "7f4fdd8ba2408c21d8058a3a2a8349a7d324fac8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/ad39a8887983f38dad1de4fae73fc4349730bdf3", - "reference": "ad39a8887983f38dad1de4fae73fc4349730bdf3", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/7f4fdd8ba2408c21d8058a3a2a8349a7d324fac8", + "reference": "7f4fdd8ba2408c21d8058a3a2a8349a7d324fac8", "shasum": "" }, "require": { @@ -4503,7 +4503,8 @@ "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://www.drupal.org/files/issues/2023-12-19/2313309-179.patch", "[#UHF-9388] Process configuration translation files for custom modules (https://www.drupal.org/i/2845437)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fd68277191b8f8ec290e53b5fbbae699b2260384/patches/drupal-2845437-process-custom-module-translation-config-10.3.x.patch", "[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "https://www.drupal.org/files/issues/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.patch", - "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch" + "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch", + "[#UHF-10716] Ensure consistent ordering when calculating library asset order (https://www.drupal.org/i/3467860)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/955e2fc9493c6574ab070187b8a5a8634da7daab/patches/drupal-3467860-optimized-js-assets-mismatch.patch" }, "drupal/default_content": { "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" @@ -4529,10 +4530,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.6", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.7", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-09-24T07:40:24+00:00" + "time": "2024-09-25T09:22:00+00:00" }, { "name": "drupal/helfi_proxy", From 18fb5f930d7e8041b75157a1f1242480c35b6cf0 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Wed, 25 Sep 2024 13:18:49 +0300 Subject: [PATCH 3/5] it was enabled. disable the module and readd to filelog --- composer.json | 1 + composer.lock | 58 ++++++++++++++++++++++++++++++++++++- conf/cmi/core.extension.yml | 1 - 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 9e377b01..a293f268 100644 --- a/composer.json +++ b/composer.json @@ -11,6 +11,7 @@ "cweagans/composer-patches": "^1.6.7", "drupal/core": "^10.0", "drupal/core-composer-scaffold": "^10.0", + "drupal/filelog": "^3.0", "drupal/hdbt": "^6.0", "drupal/hdbt_admin": "^3.0", "drupal/helfi_azure_fs": "^2.0", diff --git a/composer.lock b/composer.lock index ec0f05d8..ec18d7d2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b23bf4b4eb4fff5bb6b6e624ab64547f", + "content-hash": "70960b783e9eb471d402728e31dd549c", "packages": [ { "name": "asm89/stack-cors", @@ -3753,6 +3753,62 @@ "source": "https://git.drupalcode.org/project/file_mdm" } }, + { + "name": "drupal/filelog", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/filelog.git", + "reference": "3.0.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/filelog-3.0.0.zip", + "reference": "3.0.0", + "shasum": "76b66ad0b9920e782a3d289500827e6a5cc8ea44" + }, + "require": { + "drupal/core": "^9 || ^10", + "ext-zlib": "*", + "php": "^8" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "3.0.0", + "datestamp": "1721989445", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Christoph Burschka", + "homepage": "https://github.com/cburschka", + "email": "christoph@burschka.de", + "role": "Maintainer" + }, + { + "name": "cburschka", + "homepage": "https://www.drupal.org/user/28680" + } + ], + "description": "Logs system events to a file.", + "homepage": "https://www.drupal.org/project/filelog", + "keywords": [ + "Drupal" + ], + "support": { + "source": "https://cgit.drupalcode.org/filelog", + "issues": "https://www.drupal.org/project/issues/filelog" + } + }, { "name": "drupal/flysystem", "version": "2.1.0-rc6", diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 4cd60e11..1866e148 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -33,7 +33,6 @@ module: field_ui: 0 file: 0 file_mdm: 0 - filelog: 0 filter: 0 flysystem: 0 focal_point: 0 From 575b82356bbe2958d3eb01757eb874a7cb0deae5 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Wed, 25 Sep 2024 13:21:10 +0300 Subject: [PATCH 4/5] remove filelog configs --- conf/cmi/filelog.settings.yml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 conf/cmi/filelog.settings.yml diff --git a/conf/cmi/filelog.settings.yml b/conf/cmi/filelog.settings.yml deleted file mode 100644 index a8eca49f..00000000 --- a/conf/cmi/filelog.settings.yml +++ /dev/null @@ -1,13 +0,0 @@ -_core: - default_config_hash: uVSFqX1MwFixVjXjlh72ukQ8LKPgMKNi2raycY9vt3w -enabled: true -location: 'public://logs' -rotation: - schedule: daily - delete: false - destination: 'archive/[date:custom:Y/m/d].log' - gzip: true -format: '[[log:created]] [[log:level]] [[log:channel]] [client: [log:ip], [log:user]] [log:message]' -level: 7 -channels_type: exclude -channels: { } From 89965fd746a4418659b6b80597777691800e3563 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:57:36 +0000 Subject: [PATCH 5/5] Update configuration --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index ff498b4f..aa9d16de 100644 --- a/composer.lock +++ b/composer.lock @@ -4458,16 +4458,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.6.7", + "version": "4.6.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "7f4fdd8ba2408c21d8058a3a2a8349a7d324fac8" + "reference": "fa72a1fa6f74e86b82d741f4f70bea7398a9c53b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/7f4fdd8ba2408c21d8058a3a2a8349a7d324fac8", - "reference": "7f4fdd8ba2408c21d8058a3a2a8349a7d324fac8", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/fa72a1fa6f74e86b82d741f4f70bea7398a9c53b", + "reference": "fa72a1fa6f74e86b82d741f4f70bea7398a9c53b", "shasum": "" }, "require": { @@ -4586,10 +4586,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.7", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.8", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-09-25T09:22:00+00:00" + "time": "2024-09-25T10:53:37+00:00" }, { "name": "drupal/helfi_proxy",