Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/java/io/undertow/Undertow.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public static Builder builder() {
}

public synchronized void start() {
UndertowLogger.ROOT_LOGGER.infof("starting server: %s", Version.getFullVersionString());
UndertowLogger.ROOT_LOGGER.startingServer(Version.getFullVersionString());
xnio = Xnio.getInstance(Undertow.class.getClassLoader());
channels = new ArrayList<>();
try {
Expand Down Expand Up @@ -256,7 +256,7 @@ public synchronized void start() {
}

public synchronized void stop() {
UndertowLogger.ROOT_LOGGER.infof("stopping server: %s", Version.getFullVersionString());
UndertowLogger.ROOT_LOGGER.stoppingServer(Version.getFullVersionString());
if (channels != null) {
for (AcceptingChannel<? extends StreamConnection> channel : channels) {
IoUtils.safeClose(channel);
Expand Down
20 changes: 20 additions & 0 deletions core/src/main/java/io/undertow/UndertowLogger.java
Original file line number Diff line number Diff line change
Expand Up @@ -488,4 +488,24 @@ void nodeConfigCreated(URI connectionURI, String balancer, String domain, String
@LogMessage(level = WARN)
@Message(id = 5107, value = "Failed to set web socket timeout.")
void failedToSetWSTimeout(@Cause Exception e);

@LogMessage(level = ERROR)
@Message(id = 5108, value = "Suspended request was skipped.")
void suspendedRequestSkip(@Cause Throwable e);

@LogMessage(level = ERROR)
@Message(id = 5109, value = "Ignoring specified SameSite mode [%s] for cookie [%s].")
void ignoreSameSiteCookieMode(@Cause Throwable e, String mode, String name);

@LogMessage(level = INFO)
@Message(id = 5110, value = "Starting server: %s.")
void startingServer(String version);

@LogMessage(level = INFO)
@Message(id = 5111, value = "Stopping server: %s.")
void stoppingServer(String version);

@LogMessage(level = ERROR)
@Message(id = 5112, value = "Missing JSM permissions for path %s")
void missingJSMPermissions(@Cause SecurityException e, String path);
}
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public Cookie setSameSiteMode(final String mode) {
this.sameSiteMode = m;
this.setSameSite(true);
} else {
UndertowLogger.REQUEST_LOGGER.warnf(UndertowMessages.MESSAGES.invalidSameSiteMode(mode, Arrays.toString(CookieSameSiteMode.values())), "Ignoring specified SameSite mode [%s] for cookie [%s]", mode, this.name);
UndertowLogger.REQUEST_LOGGER.ignoreSameSiteCookieMode(UndertowMessages.MESSAGES.invalidSameSiteMode(mode, Arrays.toString(CookieSameSiteMode.values())), mode, this.name);
}
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void exchangeEvent(final HttpServerExchange exchange, final NextListener
found = true;
break;
} catch (Throwable e) {
UndertowLogger.ROOT_LOGGER.error("Suspended request was skipped", e);
UndertowLogger.ROOT_LOGGER.suspendedRequestSkip(e);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ public Resource getResource(final String p) {
UndertowLogger.REQUEST_LOGGER.debugf(e, "Invalid path %s", p);
return null;
} catch (SecurityException e) {
UndertowLogger.REQUEST_LOGGER.errorf(e, "Missing JSM permissions for path %s", p);
UndertowLogger.REQUEST_LOGGER.missingJSMPermissions(e, p);
throw e;
} catch (Exception e) {
UndertowLogger.REQUEST_LOGGER.debugf(e, "Other issue for path %s", p);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,8 @@ public interface UndertowServletLogger extends BasicLogger {
@Message(id = 15024, value = "Servlet %s init() method in web application %s threw exception")
void failedToLoad(String servletName, String appName, @Cause Throwable t);

@LogMessage(level = ERROR)
@Message(id = 15025, value = "Ignoring specified SameSite mode [%s] for cookie [%s].")
void ignoreSameSiteCookieMode(@Cause Throwable e, String mode, String name);

}
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public Cookie setSameSiteMode(final String mode) {
UndertowServletLogger.REQUEST_LOGGER.tracef("Setting SameSite mode to [%s] for cookie [%s]", m, this.getName());
cookie.setAttribute(SAME_SITE, m);
} else {
UndertowServletLogger.REQUEST_LOGGER.warnf(UndertowMessages.MESSAGES.invalidSameSiteMode(mode, Arrays.toString(CookieSameSiteMode.values())), "Ignoring specified SameSite mode [%s] for cookie [%s]", mode, this.getName());
UndertowServletLogger.REQUEST_LOGGER.ignoreSameSiteCookieMode(UndertowMessages.MESSAGES.invalidSameSiteMode(mode, Arrays.toString(CookieSameSiteMode.values())), mode, this.getName());
}
return this;
}
Expand Down
Loading