DaanHoogland commented on code in PR #13058:
URL: https://github.com/apache/cloudstack/pull/13058#discussion_r3773016419
##########
services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java:
##########
@@ -81,23 +94,31 @@ public class ConsoleProxy {
static String factoryClzName;
static boolean standaloneStart = false;
+
static String encryptorPassword = "Dummy";
- static final String[] skipProperties = new String[]{"certificate",
"cacertificate", "keystore_password", "privatekey"};
+ static final String[] skipProperties = new String[] {"certificate",
"cacertificate", "keystore_password", "privatekey"};
+
static Set<String> allowedSessions = new HashSet<>();
+
public static void addAllowedSession(String sessionUuid) {
allowedSessions.add(sessionUuid);
}
+
private static void configLog4j() {
final ClassLoader loader =
Thread.currentThread().getContextClassLoader();
URL configUrl = loader.getResource("/conf/log4j-cloud.xml");
- if (configUrl == null)
+ if (configUrl == null) {
configUrl = ClassLoader.getSystemResource("log4j-cloud.xml");
+ }
- if (configUrl == null)
+
+ if (configUrl == null) {
configUrl = ClassLoader.getSystemResource("conf/log4j-cloud.xml");
+ }
+
Review Comment:
```suggestion
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
