From 060eb70dc8e2a1dcfa46d35f5dfeab0800e004e1 Mon Sep 17 00:00:00 2001 From: Kathy Tran Date: Wed, 28 Feb 2024 16:31:04 -0500 Subject: [PATCH 1/2] Add 1.16 migrations --- templates/init_migration.sh.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/init_migration.sh.template b/templates/init_migration.sh.template index 07a488d..08e7894 100755 --- a/templates/init_migration.sh.template +++ b/templates/init_migration.sh.template @@ -12,4 +12,4 @@ java -Ddw.database.user=postgres -Ddw.database.password="{{{ POSTGRES_DBPASSWORD # this particular migration needs to run as postgres because only postgres can surrender ownership java -Ddw.database.user=postgres -Ddw.database.password="{{{ POSTGRES_DBPASSWORD }}}" -jar /home/dockstore-webservice-*.jar db migrate web.yml --include 1.7.0.relinquish # future migrations will start here and should be run as dockstore -java -Ddw.database.user=dockstore -Ddw.database.password="{{{ DOCKSTORE_DBPASSWORD }}}" -jar /home/dockstore-webservice-*.jar db migrate web.yml --include 1.8.0,1.9.0,1.10.0,1.11.0,1.12.0,1.13.0,1.14.0,1.15.0 +java -Ddw.database.user=dockstore -Ddw.database.password="{{{ DOCKSTORE_DBPASSWORD }}}" -jar /home/dockstore-webservice-*.jar db migrate web.yml --include 1.8.0,1.9.0,1.10.0,1.11.0,1.12.0,1.13.0,1.14.0,1.15.0,1.16.0 From aff6f6cc8c9c16421388494e30419bfc50c91369 Mon Sep 17 00:00:00 2001 From: Steve Von Worley Date: Thu, 7 Mar 2024 16:51:38 -0800 Subject: [PATCH 2/2] change log format to replace line feeds with carriage returns https://ucsc-cgl.atlassian.net/browse/SEAB-6148 --- templates/web.yml.template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/web.yml.template b/templates/web.yml.template index e20427d..d3ea31e 100644 --- a/templates/web.yml.template +++ b/templates/web.yml.template @@ -91,9 +91,8 @@ logging: - type: console # this the default dropwizard (logstash) logFormat for reference #logFormat: "%-5p [%d{ISO8601,UTC}] %c: %m%n%rEx" -# this is a logFormat that replaces new lines in messages with a → -# TODO: should do the same with exceptions, but I couldn't figure it out - logFormat: "%-5p [%d{ISO8601,UTC}] %c: %replace(%msg){'[\\n]','→'}%n%rEx" +# this is a logFormat that replaces new lines with carriage returns + logFormat: "%-5p [%d{ISO8601,UTC}] %c: %replace(%m){'\n','\r'}%n%replace(%rEx){'\n','\r'}" database: