From deacecc15e8aba3ee3e69ddb43210251333162d0 Mon Sep 17 00:00:00 2001
From: warptangent <warptangent@inbox.com>
Date: Wed, 27 May 2015 04:01:18 -0700
Subject: [PATCH] simplewallet: Update and add log options

Replace --set_log with --log-level for consistency.

Show default log level in usage.

Add --log-file for specifying log file path.

Document log file path.

Display log file path at startup.
---
 src/simplewallet/simplewallet.cpp | 38 +++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index de44b377f..e47938357 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -64,6 +64,7 @@ using namespace epee;
 using namespace cryptonote;
 using boost::lexical_cast;
 namespace po = boost::program_options;
+namespace bf = boost::filesystem;
 
 #define EXTENDED_LOGS_FILE "wallet_details.log"
 
@@ -82,7 +83,8 @@ namespace
   const command_line::arg_descriptor<bool> arg_restore_deterministic_wallet = {"restore-deterministic-wallet", "Recover wallet using electrum-style mnemonic", false};
   const command_line::arg_descriptor<bool> arg_non_deterministic = {"non-deterministic", "creates non-deterministic view and spend keys", false};
   const command_line::arg_descriptor<int> arg_daemon_port = {"daemon-port", "Use daemon instance at port <arg> instead of 8081", 0};
-  const command_line::arg_descriptor<uint32_t> arg_log_level = {"set_log", "", 0, true};
+  const command_line::arg_descriptor<uint32_t> arg_log_level = {"log-level", "", LOG_LEVEL_0};
+  const command_line::arg_descriptor<std::string> arg_log_file = {"log-file", "Specify log file", ""};
   const command_line::arg_descriptor<bool> arg_testnet = {"testnet", "Used to deploy test nets. The daemon must be launched with --testnet flag", false};
   const command_line::arg_descriptor<bool> arg_restricted = {"restricted-rpc", "Restricts RPC to view only commands", false};
 
@@ -1352,6 +1354,12 @@ int main(int argc, char* argv[])
   command_line::add_arg(desc_params, arg_daemon_port);
   command_line::add_arg(desc_params, arg_command);
   command_line::add_arg(desc_params, arg_log_level);
+
+  bf::path default_log {log_space::log_singletone::get_default_log_folder()};
+  default_log /= log_space::log_singletone::get_default_log_file();
+  std::cout << "default_log: " << default_log << ENDL;
+  command_line::add_arg(desc_params, arg_log_file, default_log.string());
+
   command_line::add_arg(desc_params, arg_restore_deterministic_wallet );
   command_line::add_arg(desc_params, arg_non_deterministic );
   command_line::add_arg(desc_params, arg_electrum_seed );
@@ -1391,20 +1399,32 @@ int main(int argc, char* argv[])
   if (!r)
     return 0;
 
-  //set up logging options
-  log_space::get_set_log_detalisation_level(true, LOG_LEVEL_2);
+  // log_file_path
+  //   default: <simplewallet_path>/simplewallet.log
+  //   if log-file argument given:
+  //     absolute path
+  //     relative path: relative to cwd
+
+  // Set log file
+  bf::path log_file_path {bf::absolute(command_line::get_arg(vm, arg_log_file))};
+
+  // Set up logging options
+  int log_level = LOG_LEVEL_2;
+  log_space::get_set_log_detalisation_level(true, log_level);
   //log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL, LOG_LEVEL_0);
   log_space::log_singletone::add_logger(LOGGER_FILE,
-    log_space::log_singletone::get_default_log_file().c_str(),
-    log_space::log_singletone::get_default_log_folder().c_str(), LOG_LEVEL_4);
+    log_file_path.filename().string().c_str(),
+    log_file_path.parent_path().string().c_str(),
+    LOG_LEVEL_4
+    );
 
   message_writer(epee::log_space::console_color_white, true) << CRYPTONOTE_NAME << " wallet v" << MONERO_VERSION_FULL;
 
   if(command_line::has_arg(vm, arg_log_level))
-  {
-    LOG_PRINT_L0("Setting log level = " << command_line::get_arg(vm, arg_log_level));
-    log_space::get_set_log_detalisation_level(true, command_line::get_arg(vm, arg_log_level));
-  }
+    log_level = command_line::get_arg(vm, arg_log_level);
+  LOG_PRINT_L0("Setting log level = " << log_level);
+  message_writer(epee::log_space::console_color_white, true) << "Logging at log level " << log_level << " to " << log_file_path.string();
+  log_space::get_set_log_detalisation_level(true, log_level);
 
   if(command_line::has_arg(vm, tools::wallet_rpc_server::arg_rpc_bind_port))
   {