From 5804c61bfb3ae2ca3c3bfe1d406a048bccf6a636 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Wed, 10 Jul 2013 14:06:12 -0700 Subject: [PATCH] Finish modular backend --- modules/ripple_app/node/ripple_LevelDBBackendFactory.cpp | 2 +- modules/ripple_core/functional/ripple_Config.cpp | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/ripple_app/node/ripple_LevelDBBackendFactory.cpp b/modules/ripple_app/node/ripple_LevelDBBackendFactory.cpp index 8742c84ec..ef27c96ec 100644 --- a/modules/ripple_app/node/ripple_LevelDBBackendFactory.cpp +++ b/modules/ripple_app/node/ripple_LevelDBBackendFactory.cpp @@ -19,7 +19,7 @@ public: options.filter_policy = leveldb::NewBloomFilterPolicy (10); leveldb::Status status = leveldb::DB::Open (options, path, &mDB); - if (!status.ok () || mDB) + if (!status.ok () || !mDB) throw (std::runtime_error (std::string("Unable to open/create leveldb: ") + status.ToString())); } diff --git a/modules/ripple_core/functional/ripple_Config.cpp b/modules/ripple_core/functional/ripple_Config.cpp index 741c52890..896d29828 100644 --- a/modules/ripple_core/functional/ripple_Config.cpp +++ b/modules/ripple_core/functional/ripple_Config.cpp @@ -21,7 +21,7 @@ #define SECTION_FEE_ACCOUNT_RESERVE "fee_account_reserve" #define SECTION_FEE_OWNER_RESERVE "fee_owner_reserve" #define SECTION_NODE_DB "node_db" -#define SECTION_LDB_EPHEMERAL "ephemeral_db" +#define SECTION_FASTNODE_DB "temp_db" #define SECTION_LEDGER_HISTORY "ledger_history" #define SECTION_IPS "ips" #define SECTION_NETWORK_QUORUM "network_quorum" @@ -263,9 +263,6 @@ Config::Config () SSL_VERIFY = true; - NODE_DB = "sqlite"; - - LDB_IMPORT = false; ELB_SUPPORT = false; RUN_STANDALONE = false; START_UP = NORMAL; @@ -377,7 +374,7 @@ void Config::load () (void) SectionSingleB (secConfig, SECTION_RPC_PASSWORD, RPC_PASSWORD); (void) SectionSingleB (secConfig, SECTION_RPC_USER, RPC_USER); (void) SectionSingleB (secConfig, SECTION_NODE_DB, NODE_DB); - (void) SectionSingleB (secConfig, SECTION_LDB_EPHEMERAL, LDB_EPHEMERAL); + (void) SectionSingleB (secConfig, SECTION_FASTNODE_DB, FASTNODE_DB); if (SectionSingleB (secConfig, SECTION_RPC_PORT, strTemp)) m_rpcPort = boost::lexical_cast (strTemp);