diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp | 2 | ||||
| -rw-r--r-- | src/p2p/net_node.inl | 2 | ||||
| -rw-r--r-- | src/wallet/wallet2.cpp | 15 | ||||
| -rw-r--r-- | src/wallet/wallet_errors.h | 6 |
4 files changed, 22 insertions, 3 deletions
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp b/src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp index 12ec4b14a..e5340d62f 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp +++ b/src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp @@ -123,7 +123,7 @@ cryptonote_protocol_handler_base::~cryptonote_protocol_handler_base() { void cryptonote_protocol_handler_base::handler_request_blocks_history(std::list<crypto::hash>& ids) { using namespace epee::net_utils; LOG_PRINT_L1("### ~~~RRRR~~~~ ### sending request (type 2), limit = " << ids.size()); - LOG_PRINT_RED("RATE LIMIT NOT IMPLEMENTED HERE YET (download at unlimited speed?)" , LOG_LEVEL_0); + LOG_PRINT_RED("RATE LIMIT NOT IMPLEMENTED HERE YET (download at unlimited speed?)" , LOG_LEVEL_1); _note_c("net/req2", "### ~~~RRRR~~~~ ### sending request (type 2), limit = " << ids.size()); // TODO } diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 83bb80ac0..ef733416d 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -182,7 +182,7 @@ namespace nodetool if(time(nullptr) >= it->second) { m_blocked_ips.erase(it); - LOG_PRINT_CYAN("IP " << epee::string_tools::get_ip_string_from_int32(addr) << "is unblocked.", LOG_LEVEL_0); + LOG_PRINT_CYAN("IP " << epee::string_tools::get_ip_string_from_int32(addr) << " unblocked.", LOG_LEVEL_0); return true; } return false; diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index f00d3f7ff..903e70097 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -48,6 +48,7 @@ using namespace epee; #include "cryptonote_protocol/blobdatatype.h" #include "mnemonics/electrum-words.h" #include "common/dns_utils.h" +#include "common/util.h" #include "rapidjson/document.h" #include "rapidjson/writer.h" #include "rapidjson/stringbuffer.h" @@ -1283,8 +1284,20 @@ void wallet2::store() std::string buf; bool r = ::serialization::dump_binary(cache_file_data, buf); - r = r && epee::file_io_utils::save_string_to_file(m_wallet_file, buf); THROW_WALLET_EXCEPTION_IF(!r, error::file_save_error, m_wallet_file); + + // save to new file, rename main to old, rename new to main + // at all times, there should be a valid file on disk + const std::string new_file = m_wallet_file + ".new"; + const std::string old_file = m_wallet_file + ".old"; + r = epee::file_io_utils::save_string_to_file(new_file, buf); + THROW_WALLET_EXCEPTION_IF(!r, error::file_save_error, new_file); + boost::filesystem::remove(old_file); // probably does not exist + std::error_code e = tools::replace_file(m_wallet_file, old_file); + THROW_WALLET_EXCEPTION_IF(e, error::file_save_error, m_wallet_file, e); + e = tools::replace_file(new_file, m_wallet_file); + THROW_WALLET_EXCEPTION_IF(e, error::file_save_error, m_wallet_file, e); + boost::filesystem::remove(old_file); } //---------------------------------------------------------------------------------------------------- uint64_t wallet2::unlocked_balance() const diff --git a/src/wallet/wallet_errors.h b/src/wallet/wallet_errors.h index 94518e691..dd13343ed 100644 --- a/src/wallet/wallet_errors.h +++ b/src/wallet/wallet_errors.h @@ -192,6 +192,12 @@ namespace tools { } + explicit file_error_base(std::string&& loc, const std::string& file, const std::error_code &e) + : wallet_logic_error(std::move(loc), std::string(file_error_messages[msg_index]) + " \"" + file + "\": " + e.message()) + , m_file(file) + { + } + const std::string& file() const { return m_file; } std::string to_string() const { return wallet_logic_error::to_string(); } |