Skip to content

Commit 1aa9d42

Browse files
authored
Merge pull request #475 from wunderio/release/2025-04-01
Release 2025-04-01
2 parents 39d74c6 + c238aaf commit 1aa9d42

File tree

4 files changed

+32
-11
lines changed

4 files changed

+32
-11
lines changed

drupal/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: drupal
3-
version: 1.18.0
3+
version: 1.19.0
44
dependencies:
55
- name: mariadb
66
version: 7.5.x

drupal/files/silta.services.yml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,27 @@
11
parameters:
22
monolog.channel_handlers:
3-
# Log to stderr by default.
4-
default: ['stream']
3+
default:
4+
handlers:
5+
- name: 'stream'
6+
formatter: 'json'
7+
processors:
8+
- 'message_placeholder'
9+
- 'request_uri'
10+
- 'referer'
11+
- 'current_user'
12+
- 'ip'
13+
- 'filter_backtrace'
514

615
services:
16+
# Defines a 'stream' channel handler used above.
17+
# Log to stderr by default.
18+
# The minimum (also default) logging level is 100 (DEBUG), we set it here explicitly for better visibility.
719
monolog.handler.stream:
820
class: Monolog\Handler\StreamHandler
9-
# The minimum logging level DEBUG = 100
10-
arguments: ['php://stderr', 100]
21+
arguments: [ 'php://stderr', 100 ]
22+
# Override monolog's 'filter_backtrace' processor to remove some redundant data (thus reduce data ingest)
23+
# Remove the 'link' from context data as it makes sense only in Drupal's admin UI.
24+
monolog.processor.filter_backtrace:
25+
class: Drupal\monolog\Logger\Processor\ContextKeyFilterProcessor
26+
arguments: [ [ 'backtrace', 'link' ] ]
27+
shared: false

drupal/templates/_helpers.tpl

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,8 @@ done
371371
{{- end }}
372372

373373
{{- define "drupal.data-pull-command" }}
374-
set -e
375-
374+
set -e
375+
376376
{{ include "drupal.import-reference-files" . }}
377377

378378
{{ include "drupal.wait-for-db-command" . }}
@@ -570,6 +570,10 @@ fi
570570
{{- define "drupal.backup-command.dump-database" -}}
571571
set -e
572572
573+
# Add initial delay to allow mariadb to fully initialize
574+
echo "Waiting 30 seconds for database to fully initialize..."
575+
sleep 30
576+
573577
# Generate the id of the backup.
574578
BACKUP_ID=`date +%Y-%m-%d-%H-%M-%S`
575579
BACKUP_LOCATION="/backups/$BACKUP_ID"
@@ -585,8 +589,8 @@ fi
585589
586590
# Take a database dump.
587591
echo "Starting database backup."
588-
/usr/bin/mysqldump -u $DB_USER --password=$DB_PASS -h $DB_HOST --skip-lock-tables --single-transaction --quick $IGNORE_TABLES $DB_NAME > /tmp/db.sql
589-
/usr/bin/mysqldump -u $DB_USER --password=$DB_PASS -h $DB_HOST --skip-lock-tables --single-transaction --quick --force --no-data $DB_NAME $IGNORED_TABLES >> /tmp/db.sql
592+
/usr/bin/mysqldump -u $DB_USER --password=$DB_PASS -h $DB_HOST --skip-lock-tables --single-transaction --max_allowed_packet=1G --quick $IGNORE_TABLES $DB_NAME > /tmp/db.sql
593+
/usr/bin/mysqldump -u $DB_USER --password=$DB_PASS -h $DB_HOST --skip-lock-tables --single-transaction --max_allowed_packet=1G --quick --force --no-data $DB_NAME $IGNORED_TABLES >> /tmp/db.sql
590594
echo "Database backup complete."
591595
{{- end }}
592596
@@ -667,7 +671,7 @@ fi
667671
done
668672
669673
echo "Importing database dump for validation"
670-
mysql -u $DB_USER -p$DB_PASS $DB_NAME -h $DB_HOST --protocol=tcp < /tmp/db.sql
674+
mysql -u $DB_USER -p$DB_PASS $DB_NAME -h $DB_HOST --protocol=tcp --max_allowed_packet=1G < /tmp/db.sql
671675
drush status --fields=bootstrap
672676
673677
{{- end }}

frontend/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: frontend
3-
version: 1.14.0
3+
version: 1.14.1
44
dependencies:
55
- name: mariadb
66
version: 7.10.x

0 commit comments

Comments
 (0)