Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed issue 10305 Embedded Jetty server fails to start when requests log path in RequestLogWriter contains not existed directory 

Changed error message when requests log path in RequestLogWriter contains not existed directory.
This commit is contained in:
OlexYarm 2023-10-06 12:07:44 -04:00
parent 43eb08b146
commit c338c1a153
2 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jetty-util/src/main/java/org/eclipse/jetty/util/RolloverFileOutputStream.java
View File

@ -233,9 +233,19 @@ public class RolloverFileOutputStream extends OutputStream
File file = new File(_filename);
_filename = file.getCanonicalPath();
file = new File(_filename);
File dir = new File(file.getParent());
if (!dir.isDirectory() || !dir.canWrite())
File dir = file.getParentFile();
if (!dir.exists())
{
throw new IOException("Log directory does not exist. Path=" + dir);
}
else if (!dir.isDirectory())
{
throw new IOException("Path for Log directory is not a directory. Path=" + dir);
}
else if (!dir.canWrite())
{
throw new IOException("Cannot write log directory " + dir);
}
// Is this a rollover file?
String filename = file.getName();

41
jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java
View File

@ -181,6 +181,47 @@ public class RolloverFileOutputStreamTest
assertSequence(midnight, expected);
}
@Test
public void testMissingDirectory()
{
ZoneId zone = toZoneId("Australia/Sydney");
ZonedDateTime now = toDateTime("2016.04.10-08:30:12.3 AM AEDT", zone);
String templateString = "missingDir/test-rofos-yyyy_mm_dd.log";
String excMessageExpected = "Log directory does not exist.";
try (RolloverFileOutputStream rofos =
new RolloverFileOutputStream(templateString, false, 3, TimeZone.getTimeZone(zone), null, null, now))
{
rofos.write("TICK".getBytes());
rofos.flush();
}
catch (Exception ex)
{
boolean exClassOK = false;
if (ex instanceof java.io.IOException)
{
exClassOK = true;
}
assertThat("Exception Type", exClassOK, is(true));
String excMessageActual = ex.getMessage();
boolean messageOK = false;
if (excMessageActual != null)
{
excMessageActual = excMessageActual.trim();
if (!excMessageActual.isEmpty())
{
if (excMessageActual.contains(excMessageExpected))
{
messageOK = true;
}
}
}
assertThat("Exception Message", messageOK, is(true));
}
}
@Test
public void testFileHandling() throws Exception
{