Skip to content

Commit 419b716

Browse files
ref_int: update logging hash
1 parent dbe8fa3 commit 419b716

4 files changed

Lines changed: 505 additions & 528 deletions

File tree

MODULE.bazel.lock

Lines changed: 435 additions & 525 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel_common/score_modules_target_sw.MODULE.bazel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,12 @@ git_override(
7272
bazel_dep(name = "score_logging")
7373
git_override(
7474
module_name = "score_logging",
75-
commit = "254fdfe0e35a2738917fb16d41bb70acc83f32ad",
75+
commit = "1b668f1b86460434aeeb246e762acb4f1723254d",
7676
patch_strip = 1,
7777
patches = [
7878
"//patches/logging:001-logging-example-visibility.patch",
7979
"//patches/logging:002-deps-visibility.patch",
80+
"//patches/logging:bazel.patch",
8081
],
8182
remote = "https://github.com/eclipse-score/logging.git",
8283
)

known_good.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,11 @@
9797
},
9898
"score_logging": {
9999
"repo": "https://github.com/eclipse-score/logging.git",
100-
"hash": "254fdfe0e35a2738917fb16d41bb70acc83f32ad",
100+
"hash": "1b668f1b86460434aeeb246e762acb4f1723254d",
101101
"bazel_patches": [
102102
"//patches/logging:001-logging-example-visibility.patch",
103-
"//patches/logging:002-deps-visibility.patch"],
103+
"//patches/logging:002-deps-visibility.patch",
104+
"//patches/logging:bazel.patch"],
104105
"metadata": {
105106
"extra_test_config": [
106107
"@score_logging//score/datarouter/build_configuration_flags:persistent_logging=False",

patches/logging/bazel.patch

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
diff --git a/score/datarouter/BUILD b/score/datarouter/BUILD
2+
index 2b3e408..c28de93 100644
3+
--- a/score/datarouter/BUILD
4+
+++ b/score/datarouter/BUILD
5+
@@ -73,7 +73,6 @@ cc_library(
6+
strip_include_prefix = "include",
7+
visibility = [
8+
"//platform/aas/pas/datarouterconf:__subpackages__",
9+
- "@score_logging//score/datarouter:__subpackages__",
10+
],
11+
deps = [
12+
"@score_baselibs//score/language/futurecpp",
13+
@@ -783,12 +782,7 @@ cc_library(
14+
hdrs = [
15+
"include/daemon/socketserver.h",
16+
],
17+
- defines = select({
18+
- "//score/datarouter/build_configuration_flags:dlt_output_enabled": [
19+
- "DLT_OUTPUT_ENABLED",
20+
- ],
21+
- "//conditions:default": [],
22+
- }),
23+
+ # Configuration block updated during migration
24+
features = COMPILER_WARNING_FEATURES,
25+
local_defines = select({
26+
"//score/datarouter/build_configuration_flags:config_persistent_logging": ["PERSISTENT_LOGGING"],
27+
@@ -823,12 +817,7 @@ cc_library(
28+
hdrs = [
29+
"include/daemon/socketserver.h",
30+
],
31+
- defines = select({
32+
- "//score/datarouter/build_configuration_flags:dlt_output_enabled": [
33+
- "DLT_OUTPUT_ENABLED",
34+
- ],
35+
- "//conditions:default": [],
36+
- }),
37+
+ # Configuration block updated during migration
38+
features = COMPILER_WARNING_FEATURES,
39+
local_defines = select({
40+
"//score/datarouter/build_configuration_flags:config_persistent_logging": ["PERSISTENT_LOGGING"],
41+
@@ -838,7 +827,7 @@ cc_library(
42+
visibility = ["//score/datarouter/test:__subpackages__"],
43+
deps = [
44+
":datarouter_feature_config_testing",
45+
- ":datarouter_testing",
46+
+ ":datarouter_lib",
47+
":dltserver_testing",
48+
":persistentlogconfig",
49+
":socketserver_config_lib_testing",
50+
@@ -901,9 +890,12 @@ cc_binary(
51+
"@score_baselibs//score/os:errno_logging",
52+
"@score_baselibs//score/os:pthread",
53+
"@score_baselibs//score/os/utils:path",
54+
- "@score_baselibs//score/mw/log",
55+
- # "//third_party/jemalloc", # Ticket-231781
56+
- ],
57+
+ "@score_logging//score/mw/log/backend:file",
58+
+ "@score_logging//score/mw/log/backend:remote",
59+
+ ] + select({
60+
+ "@platforms//os:qnx": ["//score/mw/log/backend:slog"],
61+
+ "//conditions:default": [],
62+
+ }),
63+
)
64+
65+
cc_library(

0 commit comments

Comments
 (0)