Michael Pasternak has uploaded a new change for review.
Change subject: sdk: configure log4j programmatically
......................................................................
sdk: configure log4j programmatically
Change-Id: I091d1e451f05a14a1ff385802a061d63adeed4c4
Signed-off-by: Michael pasternak <mpast...@redhat.com>
---
M
ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/ApiTemplate
D ovirt-engine-sdk-java/log/log4j-default.properties
D ovirt-engine-sdk-java/log/log4j-verbose.properties
D ovirt-engine-sdk-java/log/log4j.xml
M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java
5 files changed, 52 insertions(+), 63 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk-java
refs/changes/85/16185/1
diff --git
a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/ApiTemplate
b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/ApiTemplate
index 8f04312..fd7ff8f 100644
---
a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/ApiTemplate
+++
b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/templates/ApiTemplate
@@ -3,7 +3,10 @@
import java.io.IOException;
import org.apache.http.client.ClientProtocolException;
-import org.apache.log4j.PropertyConfigurator;
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
import org.ovirt.engine.sdk.web.ConnectionsPool;
import org.ovirt.engine.sdk.web.ConnectionsPoolBuilder;
import org.ovirt.engine.sdk.web.HttpProxy;
@@ -253,19 +256,31 @@
* @param debug
*/
private void configureLog4J(Boolean debug) {
- String fileSeparator = System.getProperty("file.separator");
- String configFile = null;
+ String patternLayout = "%d %-5p [%c] %m%n";
if (debug != null && Boolean.TRUE.equals(debug)) {
- configFile = "log4j-verbose.properties";
+
+ Logger rootLogger = Logger.getRootLogger();
+ if (!rootLogger.getAllAppenders().hasMoreElements()) {
+ rootLogger.setLevel(Level.INFO);
+ rootLogger.addAppender(new ConsoleAppender(
+ new PatternLayout(patternLayout)));
+
+ }
+ Logger pkgLogger =
+ rootLogger.getLoggerRepository()
+ .getLogger("org.apache.http");
+ pkgLogger.setLevel(Level.DEBUG);
+ pkgLogger.addAppender(new ConsoleAppender(
+ new PatternLayout(patternLayout)));
+
} else {
- configFile = "log4j-default.properties";
+ Logger rootLogger = Logger.getRootLogger();
+ if (!rootLogger.getAllAppenders().hasMoreElements()) {
+ rootLogger.setLevel(Level.OFF);
+ rootLogger.addAppender(new ConsoleAppender(
+ new PatternLayout(patternLayout)));
+ }
}
- PropertyConfigurator.configure(
- System.getProperty("user.dir") +
- fileSeparator +
- "log" +
- fileSeparator +
- configFile);
}
/**
diff --git a/ovirt-engine-sdk-java/log/log4j-default.properties
b/ovirt-engine-sdk-java/log/log4j-default.properties
deleted file mode 100644
index 63e0cc8..0000000
--- a/ovirt-engine-sdk-java/log/log4j-default.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootLogger=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p [%c] %m%n
-log4j.appender.DebugAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.DebugAppender.Threshold=DEBUG
\ No newline at end of file
diff --git a/ovirt-engine-sdk-java/log/log4j-verbose.properties
b/ovirt-engine-sdk-java/log/log4j-verbose.properties
deleted file mode 100644
index 12e3095..0000000
--- a/ovirt-engine-sdk-java/log/log4j-verbose.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-log4j.rootLogger=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p [%c] %m%n
-log4j.appender.DebugAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.DebugAppender.Threshold=DEBUG
-
-# --- enabling the application debug ----
-log4j.debug=True
-log4j.logger.org.apache.http=DEBUG
-#log4j.logger.org.apache.http.wire=ERROR
diff --git a/ovirt-engine-sdk-java/log/log4j.xml
b/ovirt-engine-sdk-java/log/log4j.xml
deleted file mode 100644
index e1f6c5a..0000000
--- a/ovirt-engine-sdk-java/log/log4j.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
-
- <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="ovirt-sdk-java.log"/>
- <param name="Append" value="true"/>
- <param name="MaxFileSize" value="1500KB"/>
- <param name="MaxBackupIndex" value="1"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
-
- <root>
- <priority value="DEBUG"/>
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java
b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java
index a2ad88f..eaa866b 100644
--- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java
+++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java
@@ -23,7 +23,10 @@
import java.io.IOException;
import org.apache.http.client.ClientProtocolException;
-import org.apache.log4j.PropertyConfigurator;
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
import org.ovirt.engine.sdk.web.ConnectionsPool;
import org.ovirt.engine.sdk.web.ConnectionsPoolBuilder;
import org.ovirt.engine.sdk.web.HttpProxy;
@@ -289,19 +292,31 @@
* @param debug
*/
private void configureLog4J(Boolean debug) {
- String fileSeparator = System.getProperty("file.separator");
- String configFile = null;
+ String patternLayout = "%d %-5p [%c] %m%n";
if (debug != null && Boolean.TRUE.equals(debug)) {
- configFile = "log4j-verbose.properties";
+
+ Logger rootLogger = Logger.getRootLogger();
+ if (!rootLogger.getAllAppenders().hasMoreElements()) {
+ rootLogger.setLevel(Level.INFO);
+ rootLogger.addAppender(new ConsoleAppender(
+ new PatternLayout(patternLayout)));
+
+ }
+ Logger pkgLogger =
+ rootLogger.getLoggerRepository()
+ .getLogger("org.apache.http");
+ pkgLogger.setLevel(Level.DEBUG);
+ pkgLogger.addAppender(new ConsoleAppender(
+ new PatternLayout(patternLayout)));
+
} else {
- configFile = "log4j-default.properties";
+ Logger rootLogger = Logger.getRootLogger();
+ if (!rootLogger.getAllAppenders().hasMoreElements()) {
+ rootLogger.setLevel(Level.OFF);
+ rootLogger.addAppender(new ConsoleAppender(
+ new PatternLayout(patternLayout)));
+ }
}
- PropertyConfigurator.configure(
- System.getProperty("user.dir") +
- fileSeparator +
- "log" +
- fileSeparator +
- configFile);
}
/**
--
To view, visit http://gerrit.ovirt.org/16185
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I091d1e451f05a14a1ff385802a061d63adeed4c4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine-sdk-java
Gerrit-Branch: master
Gerrit-Owner: Michael Pasternak <mpast...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
