Use keyStoreTypeDirectory in rldp-http-proxy and storage-daemon

Mainly for caching synced block in tonlib.
SpyCheese · Jun 29, 2023 · 92f8ded · 92f8ded
1 parent 53be89f
commit 92f8ded
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/rldp-http-proxy/rldp-http-proxy.cpp b/rldp-http-proxy/rldp-http-proxy.cpp
@@ -54,6 +54,7 @@
 #include "git.h"
 #include "td/utils/BufferedFd.h"
 #include "common/delay.h"
+#include "td/utils/port/path.h"
 
 #include "tonlib/tonlib/TonlibClientWrapper.h"
 #include "DNSResolver.h"
@@ -920,6 +921,12 @@ class RldpHttpProxy : public td::actor::Actor {
   }
 
   void run() {
+    if (!db_root_.empty()) {
+      td::mkpath(db_root_ + "/").ensure();
+    } else if (!is_client_) {
+      LOG(ERROR) << "DB root is required for server proxy";
+      std::_Exit(2);
+    }
     keyring_ = ton::keyring::Keyring::create(is_client_ ? std::string("") : (db_root_ + "/keyring"));
     {
       auto S = load_global_config();
@@ -955,9 +962,16 @@ class RldpHttpProxy : public td::actor::Actor {
     auto conf_dataR = td::read_file(global_config_);
     conf_dataR.ensure();
 
+    ton::tl_object_ptr<tonlib_api::KeyStoreType> key_store;
+    if (db_root_.empty()) {
+      key_store = tonlib_api::make_object<tonlib_api::keyStoreTypeInMemory>();
+    } else {
+      td::mkpath(db_root_ + "/tonlib-cache/").ensure();
+      key_store = tonlib_api::make_object<tonlib_api::keyStoreTypeDirectory>(db_root_ + "/tonlib-cache/");
+    }
     auto tonlib_options = tonlib_api::make_object<tonlib_api::options>(
         tonlib_api::make_object<tonlib_api::config>(conf_dataR.move_as_ok().as_slice().str(), "", false, false),
-        tonlib_api::make_object<tonlib_api::keyStoreTypeInMemory>());
+        std::move(key_store));
     tonlib_client_ = td::actor::create_actor<tonlib::TonlibClientWrapper>("tonlibclient", std::move(tonlib_options));
     dns_resolver_ = td::actor::create_actor<DNSResolver>("dnsresolver", tonlib_client_.get());
   }

diff --git a/storage/storage-daemon/storage-daemon.cpp b/storage/storage-daemon/storage-daemon.cpp
@@ -927,9 +927,11 @@ class StorageDaemon : public td::actor::Actor {
     }
     auto r_conf_data = td::read_file(global_config_);
     r_conf_data.ensure();
+    std::string key_store = db_root_ + "/tonlib/";
+    td::mkpath(key_store).ensure();
     auto tonlib_options = tonlib_api::make_object<tonlib_api::options>(
         tonlib_api::make_object<tonlib_api::config>(r_conf_data.move_as_ok().as_slice().str(), "", false, false),
-        tonlib_api::make_object<tonlib_api::keyStoreTypeInMemory>());
+        tonlib_api::make_object<tonlib_api::keyStoreTypeDirectory>(key_store));
     tonlib_client_ = td::actor::create_actor<tonlib::TonlibClientWrapper>("tonlibclient", std::move(tonlib_options));
   }