Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.x: Bugfixes log builder #9051

Merged
merged 2 commits into from
Jul 29, 2024
Merged

4.x: Bugfixes log builder #9051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbf24fc
Fix for builder codegen to only generate service.loader if there are …
tomas-langer Jul 28, 2024
c5179cc
Logging now correctly prints information in JUL.
tomas-langer Jul 28, 2024
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
8 changes: 6 additions & 2 deletions builder/codegen/src/main/java/io/helidon/builder/codegen/BuilderCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,18 @@ private void updateServiceLoaderResource() {
if (lines.isEmpty()) {
lines.add("# List of service contracts we want to support either from service registry, or from service loader");
}
boolean modified = false;
for (String serviceLoaderContract : this.serviceLoaderContracts) {
if (!lines.contains(serviceLoaderContract)) {
modified = true;
lines.add(serviceLoaderContract);
}
}

serviceLoaderResource.lines(lines);
serviceLoaderResource.write();
if (modified) {
serviceLoaderResource.lines(lines);
serviceLoaderResource.write();
}
}

private void process(RoundContext roundContext, TypeInfo blueprint) {
Expand Down
6 changes: 5 additions & 1 deletion logging/jul/src/main/java/io/helidon/logging/jul/JulProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2023 Oracle and/or its affiliates.
* Copyright (c) 2019, 2024 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -100,6 +100,10 @@ private static void doConfigureLogging(boolean runtime) throws IOException {
if (runtime || NativeImageHelper.isBuildTime()) {
String when = runtime ? WHEN_RUNTIME : WHEN_INIT;
Logger.getLogger(JulProvider.class.getName()).info("Logging at " + when + " configured using " + source);
} else {
// build time without native image (when not in native, this is executed only on class initialization,
// so for the user it is runtime)
Logger.getLogger(JulProvider.class.getName()).info("Logging at " + WHEN_RUNTIME + " configured using " + source);
}
}

Expand Down