Skip to content

Commit 95923ed

Browse files
committed
Ensure project-manager's logs are centrally collected
Minor fix to bring back project-manager's logs. Previous, default, configuration meant that logs for project-manager ended up in a separate file from the rest of the logs. Language server logs are being sent to the logging server by default, so should project-manager's ones as well. Fixed NPE in `SocketLoggingNode` when no `project.id` is present in loggers, as is the case with logs coming from project-manager.
1 parent e002d94 commit 95923ed

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

lib/scala/logging-service-logback/src/main/java/org/enso/logging/service/logback/SocketLoggingNode.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,10 @@ public void run() {
7676
event = (ILoggingEvent) hardenedLoggingEventInputStream.readObject();
7777
if (projectId == null) {
7878
try {
79-
projectId = UUID.fromString(event.getMDCPropertyMap().get("project.id"));
79+
var property = event.getMDCPropertyMap().get("project.id");
80+
if (property != null) {
81+
projectId = UUID.fromString(property);
82+
}
8083
} catch (IllegalArgumentException e) {
8184
// ignore
8285
}

lib/scala/logging-service/src/main/java/org/enso/logging/service/LoggingSetupHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ logLevel, actualPort, logPath(), logFileSuffix(), config.getServer(), ec)
7777
if (result.isFailure()) {
7878
setup(Option.apply(logLevel), Option.empty(), logMasking, loggerSetup);
7979
} else {
80-
URI uri = result.get();
8180
Masking.setup(logMasking);
8281
if (!loggerSetup.setup(logLevel)) {
8382
LoggingServiceManager.teardown();
8483
loggingServiceEndpointPromise.failure(new LoggerInitializationFailed());
8584
} else {
85+
URI uri = result.get();
8686
loggingServiceEndpointPromise.success(Option.apply(uri));
8787
}
8888
}

lib/scala/project-manager/src/main/resources/application.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ logging-service {
4040
name = "file"
4141
}
4242
]
43-
default-appender = file
43+
default-appender = socket
4444
default-appender = ${?ENSO_APPENDER_DEFAULT}
4545
log-to-file {
4646
enable = true
@@ -55,9 +55,9 @@ logging-service {
5555
port = ${?ENSO_LOGSERVER_PORT}
5656
log-to-file {
5757
enable = true
58-
enable = ${?ENSO_LOG_TO_FILE}
58+
enable = ${?ENSO_LOGSERVER_LOG_TO_FILE}
5959
log-level = debug
60-
log-level = ${?ENSO_LOG_TO_FILE_LOG_LEVEL}
60+
log-level = ${?ENSO_LOGSERVER_LOG_TO_FILE_LOG_LEVEL}
6161
}
6262
appenders = [ # file/console/socket/sentry
6363
{

0 commit comments

Comments
 (0)