Move security log setting to SecuritySettings

neo4j · Sep 12, 2016 · 889600a · 889600a
1 parent d00e7f9
commit 889600a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
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
@@ -519,12 +519,6 @@ private static String defaultPageCacheMemory()
     @Internal
     public static final Setting<String> auth_manager = setting( "unsupported.dbms.security.auth_manager", STRING, "" );
 
-    @Internal
-    public static final Setting<File> security_log_filename = derivedSetting("dbms.security.log_path",
-            logs_directory,
-            ( logs ) -> new File( logs, "security.log" ),
-            PATH );
-
     // Bolt Settings
 
     @Description("Default network interface to listen for incoming connections. " +

diff --git a/...src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseAuthManagerFactory.java b/...src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseAuthManagerFactory.java
@@ -29,6 +29,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.shiro.realm.Realm;
+
 import org.neo4j.dbms.DatabaseManagementSystemSettings;
 import org.neo4j.helpers.Service;
 import org.neo4j.io.fs.FileSystemAbstraction;
@@ -45,9 +47,9 @@
 import org.neo4j.server.security.auth.UserRepository;
 import org.neo4j.time.Clocks;
 
-import static org.neo4j.graphdb.factory.GraphDatabaseSettings.security_log_filename;
 import static org.neo4j.io.file.Files.createOrOpenAsOuputStream;
 import static org.neo4j.server.security.auth.BasicAuthManagerFactory.getUserRepository;
+import static org.neo4j.server.security.enterprise.auth.SecuritySettings.security_log_filename;
 
 /**
  * Wraps EnterpriseAuthManager and exposes it as a Service

diff --git a/...se/security/src/main/java/org/neo4j/server/security/enterprise/auth/SecuritySettings.java b/...se/security/src/main/java/org/neo4j/server/security/enterprise/auth/SecuritySettings.java
@@ -19,19 +19,23 @@
  */
 package org.neo4j.server.security.enterprise.auth;
 
+import java.io.File;
 import java.util.List;
 
 import org.neo4j.graphdb.config.Setting;
 import org.neo4j.graphdb.factory.Description;
+import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.helpers.HostnamePort;
 
 import static org.neo4j.kernel.configuration.Settings.BOOLEAN;
 import static org.neo4j.kernel.configuration.Settings.DURATION;
 import static org.neo4j.kernel.configuration.Settings.HOSTNAME_PORT;
 import static org.neo4j.kernel.configuration.Settings.INTEGER;
 import static org.neo4j.kernel.configuration.Settings.NO_DEFAULT;
+import static org.neo4j.kernel.configuration.Settings.PATH;
 import static org.neo4j.kernel.configuration.Settings.STRING;
 import static org.neo4j.kernel.configuration.Settings.STRING_LIST;
+import static org.neo4j.kernel.configuration.Settings.derivedSetting;
 import static org.neo4j.kernel.configuration.Settings.setting;
 
 /**
@@ -151,4 +155,10 @@ public class SecuritySettings
     @Description( "The maximum capacity for authentication and authorization caches (respectively)." )
     public static Setting<Integer> auth_cache_max_capacity =
             setting( "dbms.security.realms.auth_cache_max_capacity", INTEGER, "10000" );
+
+    @Description( "File name for the security log." )
+    public static final Setting<File> security_log_filename = derivedSetting("dbms.security.log_path",
+            GraphDatabaseSettings.logs_directory,
+            ( logs ) -> new File( logs, "security.log" ),
+            PATH );
 }