Use neo4j-logging for internal and console logging (kernel)

neo4j · Apr 14, 2015 · 7034419 · 7034419
1 parent 74cc8f0
commit 7034419
Show file tree

Hide file tree

Showing 194 changed files with 1,504 additions and 5,617 deletions.
diff --git a/community/kernel/LICENSES.txt b/community/kernel/LICENSES.txt
diff --git a/community/kernel/NOTICE.txt b/community/kernel/NOTICE.txt
@@ -25,25 +25,3 @@ Full license texts are found in LICENSES.txt.
 Third-party licenses
 --------------------
 
-Eclipse Public License, Version 1.0
-  Logback Classic Module
-  Logback Core Module
-
-GNU Lesser General Public License, Version 2.1
-  Logback Classic Module
-  Logback Core Module
-
-MIT License
-  SLF4J API Module
-
-Dependencies with multiple licenses
------------------------------------
-
-Logback Classic Module
-  Eclipse Public License, Version 1.0
-  GNU Lesser General Public License, Version 2.1
-
-Logback Core Module
-  Eclipse Public License, Version 1.0
-  GNU Lesser General Public License, Version 2.1
-
diff --git a/community/kernel/pom.xml b/community/kernel/pom.xml
@@ -203,23 +203,6 @@ the relevant Commercial Agreement.
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <additionalDependencies>
-            <additionnalDependency>
-              <groupId>ch.qos.logback</groupId>
-              <artifactId>logback-classic</artifactId>
-              <version>${logback-classic.version}</version>
-            </additionnalDependency>
-            <additionnalDependency>
-              <groupId>ch.qos.logback</groupId>
-              <artifactId>logback-core</artifactId>
-              <version>${logback-classic.version}</version>
-            </additionnalDependency>
-            <additionnalDependency>
-              <groupId>org.slf4j</groupId>
-              <artifactId>slf4j-api</artifactId>
-              <version>${slf4j-api.version}</version>
-            </additionnalDependency>
-          </additionalDependencies>
           <excludePackageNames>org.neo4j.kernel,*.impl.*</excludePackageNames>
           <groups>
             <group>
@@ -330,16 +313,13 @@ the relevant Commercial Agreement.
       <artifactId>neo4j-csv</artifactId>
       <version>${project.version}</version>
     </dependency>
-
-    <!-- main dependencies, external -->
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <optional>true</optional>
+      <groupId>org.neo4j</groupId>
+      <artifactId>neo4j-logging</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <!-- test dependencies -->
-
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-io</artifactId>
@@ -354,14 +334,23 @@ the relevant Commercial Agreement.
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.neo4j</groupId>
+      <artifactId>neo4j-logging</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -394,5 +383,10 @@ the relevant Commercial Agreement.
       <artifactId>commons-codec</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseFactory.java b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseFactory.java
@@ -26,7 +26,7 @@
 import org.neo4j.kernel.EmbeddedGraphDatabase;
 import org.neo4j.kernel.InternalAbstractGraphDatabase.Dependencies;
 import org.neo4j.kernel.extension.KernelExtensionFactory;
-import org.neo4j.kernel.logging.Logging;
+import org.neo4j.logging.LogProvider;
 import org.neo4j.kernel.monitoring.Monitors;
 
 import static java.util.Arrays.asList;
@@ -147,9 +147,9 @@ public GraphDatabaseFactory setKernelExtensions( Iterable<KernelExtensionFactory
         return this;
     }
 
-    public GraphDatabaseFactory setLogging( Logging logging )
+    public GraphDatabaseFactory setUserLogProvider( LogProvider userLogProvider )
     {
-        getCurrentState().setLogging( logging );
+        getCurrentState().setUserLogProvider( userLogProvider );
         return this;
     }
 

diff --git a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseFactoryState.java b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseFactoryState.java
@@ -25,7 +25,7 @@
 import org.neo4j.helpers.Service;
 import org.neo4j.kernel.InternalAbstractGraphDatabase.Dependencies;
 import org.neo4j.kernel.extension.KernelExtensionFactory;
-import org.neo4j.kernel.logging.Logging;
+import org.neo4j.logging.LogProvider;
 import org.neo4j.kernel.monitoring.Monitors;
 
 import static org.neo4j.kernel.GraphDatabaseDependencies.newDependencies;
@@ -34,8 +34,8 @@ public class GraphDatabaseFactoryState
 {
     private final List<Class<?>> settingsClasses;
     private final List<KernelExtensionFactory<?>> kernelExtensions;
-    private Logging logging;
     private Monitors monitors;
+    private LogProvider userLogProvider;
 
     public GraphDatabaseFactoryState() {
         settingsClasses = new ArrayList<>();
@@ -52,8 +52,8 @@ public GraphDatabaseFactoryState( GraphDatabaseFactoryState previous )
         settingsClasses = new ArrayList<>( previous.settingsClasses );
         kernelExtensions = new ArrayList<>( previous.kernelExtensions );
         monitors = previous.monitors;
-        logging = previous.logging;
         monitors = previous.monitors;
+        userLogProvider = previous.userLogProvider;
     }
 
     public Iterable<KernelExtensionFactory<?>> getKernelExtension()
@@ -75,9 +75,9 @@ public void addKernelExtensions( Iterable<KernelExtensionFactory<?>> newKernelEx
         }
     }
 
-    public void setLogging( Logging logging )
+    public void setUserLogProvider( LogProvider userLogProvider )
     {
-        this.logging = logging;
+        this.userLogProvider = userLogProvider;
     }
 
     public void setMonitors(Monitors monitors)
@@ -89,7 +89,7 @@ public Dependencies databaseDependencies()
     {
         return newDependencies().
                 monitors(monitors).
-                logging(logging).
+                userLogProvider(userLogProvider).
                 settingsClasses(settingsClasses).
                 kernelExtensions(kernelExtensions);
     }

diff --git a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java
@@ -126,15 +126,14 @@ public abstract class GraphDatabaseSettings
     @Internal
     public static final Setting<File> neo_store = setting("neo_store", PATH, "neostore", basePath(store_dir) );
 
-    // Remote logging
-    @Description("Whether to enable logging to a remote server or not.")
-    public static final Setting<Boolean> remote_logging_enabled = setting("remote_logging_enabled", BOOLEAN, FALSE );
+    @Description( "Threshold for rotation of the internal log." )
+    public static final Setting<Long> store_internal_log_rotation_threshold = setting("store.internal_log.rotation_threshold", BYTES, "20m", min(0L), max( Long.MAX_VALUE ) );
 
-    @Description( "Host for remote logging using Logback SocketAppender." )
-    public static final Setting<String> remote_logging_host = setting("remote_logging_host", STRING, "127.0.0.1", illegalValueMessage( "must be a valid hostname", matches( ANY ) ) );
+    @Description( "Minimum time (in seconds) after last rotation of the internal log before it may be rotated again." )
+    public static final Setting<Integer> store_internal_log_rotation_delay = setting("store.internal_log.rotation_threshold", INTEGER, "300", min(0), max( Integer.MAX_VALUE ) );
 
-    @Description( "Port for remote logging using Logback SocketAppender." )
-    public static final Setting<Integer> remote_logging_port = setting("remote_logging_port", INTEGER, "4560", port );
+    @Description( "Maximum number of history files for the internal log." )
+    public static final Setting<Integer> store_internal_log_archive_count = setting("store.internal_log.archive_count", INTEGER, "7", min(1) );
 
     // Indexing
     @Description("Controls the auto indexing feature for nodes. Setting it to `false` shuts it down, " +

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseDependencies.java b/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseDependencies.java
@@ -27,7 +27,7 @@
 import org.neo4j.helpers.collection.Iterables;
 import org.neo4j.kernel.extension.KernelExtensionFactory;
 import org.neo4j.kernel.impl.query.QueryEngineProvider;
-import org.neo4j.kernel.logging.Logging;
+import org.neo4j.logging.LogProvider;
 import org.neo4j.kernel.monitoring.Monitors;
 
 import static org.neo4j.helpers.collection.Iterables.addAll;
@@ -46,20 +46,20 @@ public static GraphDatabaseDependencies newDependencies()
     }
 
     private final Monitors monitors;
-    private final Logging logging;
+    private final LogProvider userLogProvider;
     private final List<Class<?>> settingsClasses;
     private final List<KernelExtensionFactory<?>> kernelExtensions;
     private final List<QueryEngineProvider> queryEngineProviders;
 
     private GraphDatabaseDependencies(
             Monitors monitors,
-            Logging logging,
+            LogProvider userLogProvider,
             List<Class<?>> settingsClasses,
             List<KernelExtensionFactory<?>> kernelExtensions,
             List<QueryEngineProvider> queryEngineProviders )
     {
         this.monitors = monitors;
-        this.logging = logging;
+        this.userLogProvider = userLogProvider;
         this.settingsClasses = settingsClasses;
         this.kernelExtensions = kernelExtensions;
         this.queryEngineProviders = queryEngineProviders;
@@ -68,39 +68,39 @@ private GraphDatabaseDependencies(
     // Builder DSL
     public GraphDatabaseDependencies monitors( Monitors monitors )
     {
-        return new GraphDatabaseDependencies( monitors, logging, settingsClasses, kernelExtensions,
+        return new GraphDatabaseDependencies( monitors, userLogProvider, settingsClasses, kernelExtensions,
                                               queryEngineProviders );
     }
 
-    public GraphDatabaseDependencies logging( Logging logging )
+    public GraphDatabaseDependencies userLogProvider( LogProvider userLogProvider )
     {
-        return new GraphDatabaseDependencies( monitors, logging, settingsClasses, kernelExtensions,
+        return new GraphDatabaseDependencies( monitors, userLogProvider, settingsClasses, kernelExtensions,
                                               queryEngineProviders );
     }
 
     public GraphDatabaseDependencies settingsClasses( List<Class<?>> settingsClasses )
     {
-        return new GraphDatabaseDependencies( monitors, logging, settingsClasses, kernelExtensions,
+        return new GraphDatabaseDependencies( monitors, userLogProvider, settingsClasses, kernelExtensions,
                                               queryEngineProviders );
     }
 
     public GraphDatabaseDependencies settingsClasses( Class<?>... settingsClass )
     {
         settingsClasses.addAll( Arrays.asList( settingsClass ) );
-        return new GraphDatabaseDependencies( monitors, logging, settingsClasses, kernelExtensions,
+        return new GraphDatabaseDependencies( monitors, userLogProvider, settingsClasses, kernelExtensions,
                                               queryEngineProviders );
     }
 
     public GraphDatabaseDependencies kernelExtensions( Iterable<KernelExtensionFactory<?>> kernelExtensions )
     {
-        return new GraphDatabaseDependencies( monitors, logging, settingsClasses,
+        return new GraphDatabaseDependencies( monitors, userLogProvider, settingsClasses,
                                               addAll( new ArrayList<KernelExtensionFactory<?>>(), kernelExtensions ),
                                               queryEngineProviders );
     }
 
     public GraphDatabaseDependencies queryEngineProviders( Iterable<QueryEngineProvider> queryEngineProviders )
     {
-        return new GraphDatabaseDependencies( monitors, logging, settingsClasses, kernelExtensions,
+        return new GraphDatabaseDependencies( monitors, userLogProvider, settingsClasses, kernelExtensions,
                                               addAll( this.queryEngineProviders, queryEngineProviders ) );
     }
 
@@ -112,9 +112,9 @@ public Monitors monitors()
     }
 
     @Override
-    public Logging logging()
+    public LogProvider userLogProvider()
     {
-        return logging;
+        return userLogProvider;
     }
 
     @Override