merge develop

dockstore · Mar 27, 2024 · 4ba336d · 4ba336d
2 parents 515b697 + aff6f6c
commit 4ba336d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
diff --git a/templates/web.yml.template b/templates/web.yml.template
@@ -96,9 +96,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: