Skip to content

Commit 1373d1c

Browse files
Handle multiple supplemental files
1 parent 8cc1e12 commit 1373d1c

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

server/embedded/src/org/labkey/embedded/LabKeyServer.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,17 @@ public static void main(String[] args)
109109
{
110110
put("logging.config", log4JConfigParts[0]);
111111
}
112-
if (log4JConfigParts.length == 2)
112+
if (log4JConfigParts.length > 1)
113113
{
114-
put("logging.log4j2.config.override", log4JConfigParts[1]);
114+
StringBuilder sb = new StringBuilder();
115+
String separator = "";
116+
for (int i = 1; i < log4JConfigParts.length; i++)
117+
{
118+
sb.append(separator);
119+
separator = ",";
120+
sb.append(log4JConfigParts[i]);
121+
}
122+
put("logging.log4j2.config.override", sb.toString());
115123
}
116124
else
117125
throw new IllegalArgumentException("log4j.configurationFile must be in the form log4j2.xml[,secondaryFile]");

0 commit comments

Comments
 (0)