Skip to content

Commit eec5e1e

Browse files
committed
Store logger name instead of object.
Some of our unit tests check for equality of `ModuleEntitlements` objects, and they are entitled to do so (no pun intended).
1 parent 6a4292a commit eec5e1e

File tree

1 file changed

+7
-3
lines changed
  • libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy

1 file changed

+7
-3
lines changed

libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ record ModuleEntitlements(
8080
String componentName,
8181
Map<Class<? extends Entitlement>, List<Entitlement>> entitlementsByType,
8282
FileAccessTree fileAccess,
83-
Logger logger
83+
String loggerName
8484
) {
8585

8686
ModuleEntitlements {
@@ -98,6 +98,10 @@ public <E extends Entitlement> Stream<E> getEntitlements(Class<E> entitlementCla
9898
}
9999
return entitlements.stream().map(entitlementClass::cast);
100100
}
101+
102+
public Logger logger() {
103+
return LogManager.getLogger(loggerName);
104+
}
101105
}
102106

103107
private FileAccessTree getDefaultFileAccess(String componentName, Path componentPath) {
@@ -573,9 +577,9 @@ private void notEntitled(String message, Class<?> callerClass, ModuleEntitlement
573577
throw exception;
574578
}
575579

576-
private static Logger getLogger(String componentName, String moduleName) {
580+
private static String getLogger(String componentName, String moduleName) {
577581
var loggerSuffix = "." + componentName + "." + ((moduleName == null) ? ALL_UNNAMED : moduleName);
578-
return LogManager.getLogger(PolicyManager.class.getName() + loggerSuffix);
582+
return PolicyManager.class.getName() + loggerSuffix;
579583
}
580584

581585
public void checkManageThreadsEntitlement(Class<?> callerClass) {

0 commit comments

Comments
 (0)