Test 4

RickiNano · Jan 19, 2025 · e443e63 · e443e63
1 parent 65c3656
commit e443e63
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/nano/node/nodeconfig.cpp b/nano/node/nodeconfig.cpp
@@ -675,15 +675,6 @@ std::string nano::node_config::serialize_database_backend (nano::database_backen
 
 nano::database_backend nano::node_config::get_database_backend (nano::tomlconfig & toml)
 {
-	// Check for environment variable
-	const char * env_backend = std::getenv ("BACKEND");
-	if (env_backend)
-	{
-		std::string backend_string (env_backend);
-		return backend_string == "rocksdb" ? nano::database_backend::rocksdb : nano::database_backend::lmdb;
-	}
-
-	// Check config file settings
 	if (toml.has_key ("database_backend"))
 	{
 		auto backend_string (toml.get<std::string> ("database_backend"));

diff --git a/nano/node/nodeconfig.hpp b/nano/node/nodeconfig.hpp
@@ -139,7 +139,7 @@ class node_config
 	uint64_t max_pruning_depth{ 0 };
 	nano::rocksdb_config rocksdb_config;
 	nano::lmdb_config lmdb_config;
-	nano::database_backend database_backend{ nano::database_backend::lmdb };
+	nano::database_backend database_backend{ std::string (std::getenv ("BACKEND") ? std::getenv ("BACKEND") : "") == "rocksdb" ? nano::database_backend::rocksdb : nano::database_backend::lmdb };
 	bool enable_upnp{ true };
 	std::size_t max_ledger_notifications{ 8 };