Fix startup errors with embedded Tomcat deployments (#772)

- Be less strict about labkeyServer jar file name - Fix typo in property name: smtpStartTlsEnable - Don't attempt to delete a non-existent backup
LabKey · Mar 18, 2024 · f6832a1 · f6832a1
1 parent e83ea68
commit f6832a1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/server/configs/application.properties b/server/configs/application.properties
@@ -70,7 +70,7 @@ mail.smtpPort=@@smtpPort@@
 mail.smtpUser=@@smtpUser@@
 #mail.smtpFrom=@@smtpFrom@@
 #mail.smtpPassword=@@smtpPassword@@
-#mail.startTlsEnable=@@smtpStartTlsEnable@@
+#mail.smtpStartTlsEnable=@@smtpStartTlsEnable@@
 #mail.smtpSocketFactoryClass=@@smtpSocketFactoryClass@@
 #mail.smtpAuth=@@smtpAuth@@
 

diff --git a/server/configs/webapps/embedded/config/application.properties b/server/configs/webapps/embedded/config/application.properties
@@ -66,7 +66,7 @@ mail.smtpPort=25
 mail.smtpUser=Anonymous
 #mail.smtpFrom=@@smtpFrom@@
 #mail.smtpPassword=@@smtpPassword@@
-#mail.startTlsEnable=@@smtpStartTlsEnable@@
+#mail.smtpStartTlsEnable=@@smtpStartTlsEnable@@
 #mail.smtpSocketFactoryClass=@@smtpSocketFactoryClass@@
 #mail.smtpAuth=@@smtpAuth@@
 

diff --git a/server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java b/server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java
@@ -31,7 +31,7 @@ public EmbeddedExtractor()
     {
         File[] files = currentDir.listFiles(file -> {
             String name = file.getName().toLowerCase();
-            return name.endsWith(".jar") && name.contains("labkeyserver");
+            return name.endsWith(".jar") && !name.contains("embedded") && !name.contains("labkeybootstrap");
         });
 
         if (files == null || files.length == 0)
@@ -295,7 +295,10 @@ private void backupExistingDistribution(File webAppLocation)
             if (toBackup.stream().anyMatch(File::exists))
             {
                 File backupDir = new File(verifyJar().getParentFile(), "backup");
-                FileUtils.forceDelete(backupDir); // Delete existing backup
+                if (backupDir.exists())
+                {
+                    FileUtils.forceDelete(backupDir); // Delete existing backup
+                }
 
                 for (File f : toBackup)
                 {