Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-05 23:24:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

wallet: move some scoped_message_writer calls from the libs

Browse source
This commit is contained in:
moneromooo-monero 2017-10-28 23:04:24 +01:00
parent e89994e98f
commit 437421ce42
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
6 changed files with 86 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/wallet/wallet_rpc_server.cpp
View file

@ -38,6 +38,7 @@ using namespace epee;
#include "wallet/wallet_args.h"
#include "common/command_line.h"
#include "common/i18n.h"
#include "common/scoped_message_writer.h"
#include "cryptonote_basic/cryptonote_format_utils.h"
#include "cryptonote_basic/account.h"
#include "wallet_rpc_server_commands_defs.h"
@ -1981,6 +1982,7 @@ int main(int argc, char** argv) {
"monero-wallet-rpc [--wallet-file=<file>|--generate-from-json=<file>|--wallet-dir=<directory>] [--rpc-bind-port=<port>]",
desc_params,
po::positional_options_description(),
[](const std::string &s, bool emphasis){ tools::scoped_message_writer(emphasis ? epee::console_color_white : epee::console_color_default, true) << s; },
"monero-wallet-rpc.log",
true
);
@ -2021,7 +2023,15 @@ int main(int argc, char** argv) {
}
else
{
wal = tools::wallet2::make_from_json(*vm, from_json, password_prompter);
try
{
wal = tools::wallet2::make_from_json(*vm, from_json, password_prompter);
}
catch (const std::exception &e)
{
MERROR("Error creating wallet: " << e.what());
return 1;
}
}
if (!wal)
{