You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2021/09/10 01:03:19 UTC
[brooklyn-dist] branch master updated (cd5153c -> ea87b74)
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git.
from cd5153c example in comments for configuring a login form
new 103603b improve comments on HA in config
new ea87b74 exclude chatty logging by felix SCR
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../resources/org.apache.brooklyn.osgilauncher.cfg | 8 +++++---
.../resources/org.apache.felix.scr.ScrService.cfg} | 19 +++++++------------
.../resources/resources/etc/org.ops4j.pax.logging.cfg | 6 ++++++
3 files changed, 18 insertions(+), 15 deletions(-)
copy karaf/{features/src/main/resources/resources/etc/custom.system.properties => config/src/main/resources/org.apache.felix.scr.ScrService.cfg} (68%)
[brooklyn-dist] 02/02: exclude chatty logging by felix SCR
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit ea87b74e6c629f551632c5365f96e51e990416eb
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Sep 10 02:01:16 2021 +0100
exclude chatty logging by felix SCR
using our namespace, with setting in scr that should soon allow us to remove the logging.cfg changes here
---
.../resources/org.apache.felix.scr.ScrService.cfg | 27 ++++++++++++++++++++++
.../resources/etc/org.ops4j.pax.logging.cfg | 6 +++++
2 files changed, 33 insertions(+)
diff --git a/karaf/config/src/main/resources/org.apache.felix.scr.ScrService.cfg b/karaf/config/src/main/resources/org.apache.felix.scr.ScrService.cfg
new file mode 100644
index 0000000..71aafad
--- /dev/null
+++ b/karaf/config/src/main/resources/org.apache.felix.scr.ScrService.cfg
@@ -0,0 +1,27 @@
+################################################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+# make SCR components wrapping a call eg UiMetadataConfigListener
+# use their own namespace for logging not the namespace of the wrapped class;
+# to prevent flooding of the logs with low-level SCR debug for the above class.
+# (not working with 2.1.24 but likely soon after as was added around time of release;
+# other fields eg ds.loglevel set here are visible in karaf with scr:config)
+# see https://github.com/apache/felix-dev/pull/36
+ds.log.extension=true
+
diff --git a/karaf/features/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg b/karaf/features/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
index 3de253f..b4389e7 100644
--- a/karaf/features/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
+++ b/karaf/features/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
@@ -171,3 +171,9 @@ log4j2.logger.ServletContainerInitializerScanner.level = ERROR
log4j2.logger.JettyFactoryImpl.name = org.ops4j.pax.web.service.jetty.internal.JettyFactoryImpl
log4j2.logger.JettyFactoryImpl.level = ERROR
+# felix scr abuses this category for lots of its debug; might not be needed when new config in org.apache.felix.scr.ScrService.cfg is available
+log4j2.logger.UiMetadataConfigListener.name = org.apache.brooklyn.ui.modularity.metadata.registry.impl.UiMetadataConfigListener
+log4j2.logger.UiMetadataConfigListener.level = INFO
+
+
+
[brooklyn-dist] 01/02: improve comments on HA in config
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 103603b1741721849d55f6b047caf685a2e5fb33
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Sep 10 02:01:00 2021 +0100
improve comments on HA in config
---
.../src/main/resources/org.apache.brooklyn.osgilauncher.cfg | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/karaf/config/src/main/resources/org.apache.brooklyn.osgilauncher.cfg b/karaf/config/src/main/resources/org.apache.brooklyn.osgilauncher.cfg
index 125cabf..957be16 100644
--- a/karaf/config/src/main/resources/org.apache.brooklyn.osgilauncher.cfg
+++ b/karaf/config/src/main/resources/org.apache.brooklyn.osgilauncher.cfg
@@ -35,15 +35,17 @@ default.catalog.location=${karaf.etc}/default.catalog.bom
#ignorePersistenceErrors=true
# The high availability mode. Possible values are:
-# - DISABLED: management node works in isolation - will not cooperate with any other standby/master nodes in management plane;
-# - AUTO: will look for other management nodes, and will allocate itself as standby or master based on other nodes' states;
+# - AUTO: (default) will look for other management nodes, and will allocate itself as standby or master based on other nodes' states,
+# using HOT_STANDBY as the preferred standby unless the `defaultStandbyIsHot` experimental feature is set false;
# - MASTER: will startup as master - if there is already a master then fails immediately;
+# - DISABLED: management node works in isolation - will not cooperate with any other standby/master nodes in management plane,
+# will assume no other nodes are using the same persisted state, and may break persistence if other nodes are;
# - STANDBY: will start up as lukewarm standby with no state - if there is not already a master then fails immediately,
# and if there is a master which subsequently fails, this node can promote itself;
# - HOT_STANDBY: will start up as hot standby in read-only mode - if there is not already a master then fails immediately,
# and if there is a master which subsequently fails, this node can promote itself;
# - HOT_BACKUP: will start up as hot backup in read-only mode - no master is required, and this node will not become a master
-#highAvailabilityMode=DISABLED
+#highAvailabilityMode=AUTO
# The persistence mode. Possible values are:
# - AUTO: (default) will rebind to any existing state, or start up fresh if no state;