explicitly set the cat under which jdk logging is logged

tmm1 · Feb 18, 2011 · 8d867dc · 8d867dc
1 parent dab23a4
commit 8d867dc
Show file tree

Hide file tree

Showing 10 changed files with 440 additions and 35 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/modules/plugin-transport-wares.iml b/.idea/modules/plugin-transport-wares.iml
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLogger.java b/modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLogger.java
@@ -31,9 +31,12 @@ public class JdkESLogger extends AbstractESLogger {
 
     private final Logger logger;
 
-    public JdkESLogger(String prefix, Logger logger) {
+    private final String name;
+
+    public JdkESLogger(String prefix, String name, Logger logger) {
         super(prefix);
         this.logger = logger;
+        this.name = name;
     }
 
     @Override public String getName() {
@@ -61,42 +64,42 @@ public JdkESLogger(String prefix, Logger logger) {
     }
 
     @Override protected void internalTrace(String msg) {
-        logger.log(Level.FINEST, msg);
+        logger.logp(Level.FINEST, name, null, msg);
     }
 
     @Override protected void internalTrace(String msg, Throwable cause) {
-        logger.log(Level.FINEST, msg, cause);
+        logger.logp(Level.FINEST, name, null, msg, cause);
     }
 
     @Override protected void internalDebug(String msg) {
-        logger.log(Level.FINE, msg);
+        logger.logp(Level.FINE, name, null, msg);
     }
 
     @Override protected void internalDebug(String msg, Throwable cause) {
-        logger.log(Level.FINE, msg, cause);
+        logger.logp(Level.FINE, name, null, msg, cause);
     }
 
     @Override protected void internalInfo(String msg) {
-        logger.log(Level.INFO, msg);
+        logger.logp(Level.INFO, name, null, msg);
     }
 
     @Override protected void internalInfo(String msg, Throwable cause) {
-        logger.log(Level.INFO, msg, cause);
+        logger.logp(Level.INFO, name, null, msg, cause);
     }
 
     @Override protected void internalWarn(String msg) {
-        logger.log(Level.WARNING, msg);
+        logger.logp(Level.WARNING, name, null, msg);
     }
 
     @Override protected void internalWarn(String msg, Throwable cause) {
-        logger.log(Level.WARNING, msg, cause);
+        logger.logp(Level.WARNING, name, null, msg, cause);
     }
 
     @Override protected void internalError(String msg) {
-        logger.log(Level.SEVERE, msg);
+        logger.logp(Level.SEVERE, name, null, msg);
     }
 
     @Override protected void internalError(String msg, Throwable cause) {
-        logger.log(Level.SEVERE, msg, cause);
+        logger.logp(Level.SEVERE, name, null, msg, cause);
     }
 }
diff --git a/.../elasticsearch/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLoggerFactory.java b/.../elasticsearch/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLoggerFactory.java
@@ -29,6 +29,6 @@ public class JdkESLoggerFactory extends ESLoggerFactory {
 
     @Override public ESLogger newInstance(String prefix, String name) {
         final java.util.logging.Logger logger = java.util.logging.Logger.getLogger(name);
-        return new JdkESLogger(prefix, logger);
+        return new JdkESLogger(prefix, name, logger);
     }
 }
diff --git a/...s/transport/memcached/src/main/java/org/elasticsearch/memcached/MemcachedRestRequest.java b/...s/transport/memcached/src/main/java/org/elasticsearch/memcached/MemcachedRestRequest.java
@@ -20,13 +20,11 @@
 package org.elasticsearch.memcached;
 
 import org.elasticsearch.common.Unicode;
-import org.elasticsearch.common.collect.ImmutableSet;
 import org.elasticsearch.rest.support.AbstractRestRequest;
 import org.elasticsearch.rest.support.RestUtils;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * @author kimchy (shay.banon)
@@ -137,18 +135,10 @@ public void setData(byte[] data) {
         return Unicode.fromBytes(data);
     }
 
-    @Override public Set<String> headerNames() {
-        return ImmutableSet.of();
-    }
-
     @Override public String header(String name) {
         return null;
     }
 
-    @Override public String cookie() {
-        return null;
-    }
-
     @Override public boolean hasParam(String key) {
         return params.containsKey(key);
     }

diff --git a/plugins/transport/thrift/src/main/java/org/elasticsearch/thrift/ThriftRestRequest.java b/plugins/transport/thrift/src/main/java/org/elasticsearch/thrift/ThriftRestRequest.java
@@ -21,13 +21,11 @@
 
 import org.elasticsearch.common.Bytes;
 import org.elasticsearch.common.Unicode;
-import org.elasticsearch.common.collect.ImmutableSet;
 import org.elasticsearch.rest.support.AbstractRestRequest;
 import org.elasticsearch.rest.support.RestUtils;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * @author kimchy (shay.banon)
@@ -115,24 +113,13 @@ public ThriftRestRequest(org.elasticsearch.thrift.RestRequest request) {
         return Unicode.fromBytes(contentByteArray(), contentByteArrayOffset(), contentLength());
     }
 
-    @Override public Set<String> headerNames() {
-        if (request.getHeaders() == null) {
-            return ImmutableSet.of();
-        }
-        return request.getHeaders().keySet();
-    }
-
     @Override public String header(String name) {
         if (request.getHeaders() == null) {
             return null;
         }
         return request.getHeaders().get(name);
     }
 
-    @Override public String cookie() {
-        return null;
-    }
-
     @Override public boolean hasParam(String key) {
         return params.containsKey(key);
     }

diff --git a/plugins/transport/wares/build.gradle b/plugins/transport/wares/build.gradle
@@ -0,0 +1,127 @@
+dependsOn(':elasticsearch')
+
+apply plugin: 'java'
+apply plugin: 'maven'
+
+archivesBaseName = "elasticsearch-transport-wares"
+
+explodedDistDir = new File(distsDir, 'exploded')
+
+configurations.compile.transitive = true
+configurations.testCompile.transitive = true
+
+// no need to use the resource dir
+sourceSets.main.resources.srcDirs 'src/main/java'
+sourceSets.test.resources.srcDirs 'src/test/java'
+
+jar {
+//    from sourceSets.main.allJava
+    manifest {
+        attributes("Implementation-Title": "ElasticSearch", "Implementation-Version": rootProject.version, "Implementation-Date": buildTimeStr)
+    }
+}
+
+configurations {
+    dists
+    distLib {
+        visible = false
+        transitive = false
+    }
+}
+
+dependencies {
+    compile project(':elasticsearch')
+    compile 'javax.servlet:servlet-api:2.5'
+}
+
+task explodedDist(dependsOn: [jar], description: 'Builds the plugin zip file') << {
+    [explodedDistDir]*.mkdirs()
+
+    copy {
+        from configurations.distLib
+        into explodedDistDir
+    }
+
+    // remove elasticsearch files (compile above adds the elasticsearch one)
+    ant.delete { fileset(dir: explodedDistDir, includes: "elasticsearch-*.jar") }
+
+    copy {
+        from libsDir
+        into explodedDistDir
+    }
+
+    ant.delete { fileset(dir: explodedDistDir, includes: "elasticsearch-*-javadoc.jar") }
+    ant.delete { fileset(dir: explodedDistDir, includes: "elasticsearch-*-sources.jar") }
+}
+
+task zip(type: Zip, dependsOn: ['explodedDist']) {
+    from(explodedDistDir) {
+    }
+}
+
+task release(dependsOn: [zip]) << {
+    ant.delete(dir: explodedDistDir)
+    copy {
+        from distsDir
+        into(new File(rootProject.distsDir, "plugins"))
+    }
+}
+
+configurations {
+    deployerJars
+    tools
+}
+
+dependencies {
+    deployerJars "org.apache.maven.wagon:wagon-http:1.0-beta-2"
+    tools "com.google.code:jarjar:1.0"
+}
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}
+
+uploadArchives {
+    repositories.mavenDeployer {
+        configuration = configurations.deployerJars
+        repository(url: rootProject.mavenRepoUrl) {
+            authentication(userName: rootProject.mavenRepoUser, password: rootProject.mavenRepoPass)
+        }
+        snapshotRepository(url: rootProject.mavenSnapshotRepoUrl) {
+            authentication(userName: rootProject.mavenRepoUser, password: rootProject.mavenRepoPass)
+        }
+
+        pom.project {
+            inceptionYear '2009'
+            name 'elasticsearch-plugins-transport-wares'
+            description 'War Plugin for ElasticSearch'
+            licenses {
+                license {
+                    name 'The Apache Software License, Version 2.0'
+                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    distribution 'repo'
+                }
+            }
+            scm {
+                connection 'git://github.com/elasticsearch/elasticsearch.git'
+                developerConnection 'git@github.com:elasticsearch/elasticsearch.git'
+                url 'http://github.com/elasticsearch/elasticsearch'
+            }
+        }
+
+        pom.whenConfigured {pom ->
+            pom.dependencies = pom.dependencies.findAll {dep -> dep.scope != 'test' } // removes the test scoped ones
+        }
+    }
+}