Merge pull request #2415 from rsksmart/vovchyk/cleanup

chore: cleanup; add missing logger to logback.xml
rsksmart · May 29, 2024 · 8959ab2 · 8959ab2
2 parents af60eb5 + a5695d3
commit 8959ab2
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 14 deletions.
diff --git a/rskj-core/src/main/java/co/rsk/RskContext.java b/rskj-core/src/main/java/co/rsk/RskContext.java
@@ -1629,7 +1629,7 @@ List<String> getInitialBootNodes(KnownPeersHandler knownPeersHandler) {
 
         if (rskSystemProperties.usePeersFromLastSession()) {
             List<String> peerLastSession = knownPeersHandler.readPeers();
-            logger.debug("Loading peers from previous session: {}",peerLastSession);
+            logger.info("Loading peers from previous session: {}", peerLastSession);
             initialBootNodes.addAll(peerLastSession);
         }
         return new ArrayList<>(initialBootNodes);

diff --git a/rskj-core/src/main/java/org/ethereum/datasource/LevelDbDataSource.java b/rskj-core/src/main/java/org/ethereum/datasource/LevelDbDataSource.java
@@ -65,12 +65,6 @@ public LevelDbDataSource(String name, String databaseDir) {
         logger.info("New LevelDbDataSource: {}", name);
     }
 
-    public static KeyValueDataSource makeDataSource(Path datasourcePath) {
-        KeyValueDataSource ds = new LevelDbDataSource(datasourcePath.getFileName().toString(), datasourcePath.getParent().toString());
-        ds.init();
-        return ds;
-    }
-
     @Override
     public void init() {
         resetDbLock.writeLock().lock();

diff --git a/rskj-core/src/main/java/org/ethereum/datasource/RocksDbDataSource.java b/rskj-core/src/main/java/org/ethereum/datasource/RocksDbDataSource.java
@@ -69,12 +69,6 @@ public RocksDbDataSource(String name, String databaseDir) {
         logger.info("New RocksDbDataSource: {}", name);
     }
 
-    public static KeyValueDataSource makeDataSource(Path datasourcePath) {
-        KeyValueDataSource ds = new RocksDbDataSource(datasourcePath.getFileName().toString(), datasourcePath.getParent().toString());
-        ds.init();
-        return ds;
-    }
-
     @Override
     public void init() {
         resetDbLock.writeLock().lock();

diff --git a/rskj-core/src/main/resources/logback.xml b/rskj-core/src/main/resources/logback.xml
@@ -109,6 +109,7 @@
     <logger name="altbn128" level="INFO" />
     <logger name="co.rsk.net.discovery.PeerExplorer" level="INFO" />
     <logger name="co.rsk.net.discovery.NodeChallengeManager" level="INFO" />
+    <logger name="co.rsk.RskContext" level="INFO" />
 
     <!-- Use INFO or upper levels for production environments. -->
     <logger name="com.googlecode.jsonrpc4j" level="INFO" />

diff --git a/rskj-core/src/test/resources/test-rskj.conf b/rskj-core/src/test/resources/test-rskj.conf
@@ -88,7 +88,7 @@ samples.dir = samples
 database.reset = true
 
 # place to save physical storage files
-database.dir = database-test
+database.dir = build/tmp/database-test
 
 # for testing purposes
 # all the state will be dumped