Roy Golan has uploaded a new change for review.

Change subject: core: Add the host name to the logging context
......................................................................

core: Add the host name to the logging context

This patch uses log4j MDC [1] which is a key-value map
of string an application puts on the Thread-local and can be used in the
logging.

This greatly improves and simplifies logging in the Various VdsManager
flows.

Every line of log from VdsManager threads will look something like:
  [org.ovirt.engine.core.vdsbroker.VdsManager]
  (DefaultQuartzScheduler_Worker-6) Host[monster] the log message...

[1] http://logging.apache.org/log4j/2.x/manual/thread-context.html

Change-Id: Iafad27da56400741974132c956f90ba937c20a98
Signed-off-by: Roy Golan <[email protected]>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
M packaging/services/ovirt-engine.xml.in
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/16548/1

diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
index 71aad99..7bf4647 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
@@ -11,6 +11,7 @@
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.lang.exception.ExceptionUtils;
+import org.jboss.logging.MDC;
 import org.ovirt.engine.core.common.AuditLogType;
 import org.ovirt.engine.core.common.FeatureSupported;
 import org.ovirt.engine.core.common.businessentities.NonOperationalReason;
@@ -219,6 +220,7 @@
 
                 synchronized (getLockObj()) {
                     _vds = DbFacade.getInstance().getVdsDao().get(getVdsId());
+                    MDC.put("vds", _vds.toString());
                     if (_vds == null) {
                         log.errorFormat("VdsManager::refreshVdsRunTimeInfo - 
OnTimer is NULL for {0}",
                                 getVdsId());
diff --git a/packaging/services/ovirt-engine.xml.in 
b/packaging/services/ovirt-engine.xml.in
index f11cbfb..7c69395 100644
--- a/packaging/services/ovirt-engine.xml.in
+++ b/packaging/services/ovirt-engine.xml.in
@@ -64,7 +64,7 @@
       <!-- All the application server messages go here: -->
       <file-handler name="SERVER">
         <formatter>
-          <pattern-formatter pattern="%d %-5p [%c] (%t) %s%E%n"/>
+          <pattern-formatter pattern="%d %-5p [%c] (%t) %X{vds} %s%E%n"/>
         </formatter>
         <file path="$getstring('ENGINE_LOG')/server.log"/>
         <append value="true"/>
@@ -74,7 +74,7 @@
       <file-handler name="ENGINE" autoflush="true">
         <level name="INFO"/>
         <formatter>
-          <pattern-formatter pattern="%d %-5p [%c] (%t) %s%E%n"/>
+          <pattern-formatter pattern="%d %-5p [%c] (%t) %X{vds} %s%E%n"/>
         </formatter>
         <file path="$getstring('ENGINE_LOG')/engine.log"/>
         <append value="true"/>
@@ -84,7 +84,7 @@
       <console-handler name="CONSOLE" autoflush="true">
         <level name="INFO"/>
         <formatter>
-          <pattern-formatter pattern="%d %-5p [%c] (%t) %s%E%n"/>
+          <pattern-formatter pattern="%d %-5p [%c] (%t) %X{vds} %s%E%n"/>
         </formatter>
       </console-handler>
 


-- 
To view, visit http://gerrit.ovirt.org/16548
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafad27da56400741974132c956f90ba937c20a98
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to