Put the consistency checker report in the logs directory.

neo4j · Mar 17, 2016 · 6498dd1 · 6498dd1
1 parent 594c24d
commit 6498dd1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java
@@ -125,7 +125,7 @@ public Result runFullConsistencyCheck( final File storeDir, Config tuningConfigu
                 new DefaultIdGeneratorFactory( fileSystem ), pageCache, fileSystem, logProvider );
 
         ConsistencySummaryStatistics summary;
-        final File reportFile = chooseReportPath( storeDir, tuningConfiguration );
+        final File reportFile = chooseReportPath(tuningConfiguration );
         Log reportLog = new ConsistencyReportLog( Suppliers.lazySingleton( () -> {
             try
             {
@@ -194,20 +194,10 @@ storeDir, fullStoreLabelUpdateStream( () -> indexStoreView ),
         return Result.SUCCESS;
     }
 
-    private File chooseReportPath( File storeDir, Config tuningConfiguration )
+    private File chooseReportPath( Config tuningConfiguration)
     {
-        final File reportPath = tuningConfiguration.get( ConsistencyCheckSettings.consistency_check_report_file );
+        final File reportPath = tuningConfiguration.get( ConsistencyCheckSettings.consistency_check_report_directory );
-        if ( reportPath == null )
+        return new File( reportPath, defaultLogFileName( timestamp ) );
-        {
-            return new File( storeDir, defaultLogFileName( timestamp ) );
-        }
-
-        if ( reportPath.isDirectory() )
-        {
-            return new File( reportPath, defaultLogFileName( timestamp ) );
-        }
-
-        return reportPath;
     }
 
     public static String defaultLogFileName( Date date )

diff --git a/...unity/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckSettings.java b/...unity/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckSettings.java
@@ -23,6 +23,7 @@
 
 import org.neo4j.graphdb.config.Setting;
 import org.neo4j.graphdb.factory.Description;
+import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 
 import static org.neo4j.kernel.configuration.Settings.BOOLEAN;
 import static org.neo4j.kernel.configuration.Settings.FALSE;
@@ -56,5 +57,6 @@ public class ConsistencyCheckSettings
     @SuppressWarnings("unchecked")
     @Description("File name for inconsistencies log file. If not specified, logs to a file in the store directory.")
     public static final
-    Setting<File> consistency_check_report_file = setting( "tools.consistency_checker.report_file", PATH, NO_DEFAULT );
+    Setting<File> consistency_check_report_directory = setting( "tools.consistency_checker.report_directory", PATH,
+            GraphDatabaseSettings.logs_directory.getDefaultValue() );
 }
diff --git a/...ncy-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java b/...ncy-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java
@@ -101,7 +101,7 @@ public void shouldWriteInconsistenciesToLogFileAtSpecifiedLocation() throws Exce
         ConsistencyCheckService service = new ConsistencyCheckService();
         File specificLogFile = new File( testDirectory.directory(), "specific_logfile.txt" );
         Config configuration = new Config(
-                settings( ConsistencyCheckSettings.consistency_check_report_file.name(), specificLogFile.getPath() ),
+                settings( ConsistencyCheckSettings.consistency_check_report_directory.name(), specificLogFile.getPath() ),
                 GraphDatabaseSettings.class, ConsistencyCheckSettings.class
         );