oxen-io/oxen-core
2
1
Fork 0
mirror of https://github.com/oxen-io/oxen-core.git synced 2023-12-14 02:22:56 +01:00
Code Issues Projects Releases Wiki Activity

make lokid.sock and move the .oxen folder migration to before logs initialise folder

Browse source
This commit is contained in:
Sean Darcy 2021-01-07 14:39:58 +11:00 committed by Jason Rhinelander
parent ae80adb5b1
commit e3319dcfda
2 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/daemon/main.cpp
View file

@ -61,7 +61,6 @@ using namespace std::literals;
int main(int argc, char const * argv[])
{
try {
// TODO parse the debug options like set log level right here at start
tools::on_startup();
@ -195,6 +194,24 @@ int main(int argc, char const * argv[])
// Create data dir if it doesn't exist
auto data_dir = fs::absolute(fs::u8path(command_line::get_arg(vm, cryptonote::arg_data_dir)));
// Will check if the default data directory is used and if it exists. Then will ensure that migration from the old data directory (.loki) has occurred if it exists.
if (command_line::is_arg_defaulted(vm, cryptonote::arg_data_dir) && !fs::exists(data_dir)){
auto old_data_dir = tools::get_depreciated_default_data_dir();
if (testnet) old_data_dir /= "testnet";
else if (devnet) old_data_dir /= "devnet";
if (fs::is_directory(old_data_dir))
{
if (!tools::create_directories_if_necessary(data_dir.parent_path()))
throw std::runtime_error{"Data-directory migration failed: can't create " + data_dir.parent_path().u8string()};
fs::rename(old_data_dir, data_dir);
MGINFO_CYAN("Migrated data directory from " << old_data_dir << " to " << data_dir);
#ifndef WIN32
fs::create_directory_symlink(data_dir, old_data_dir);
#endif
}
}
// FIXME: not sure on windows implementation default, needs further review
//fs::path relative_path_base = daemonizer::get_relative_path_base(vm);
fs::path relative_path_base = data_dir;
@ -219,24 +236,7 @@ int main(int argc, char const * argv[])
mlog_set_log(command_line::get_arg(vm, daemon_args::arg_log_level).c_str());
}
// after logs initialized create the data directory. Will check if the default data directory is used and if it exists. Then will ensure that migration from the old data directory (.loki) has occurred if it exists.
if (command_line::is_arg_defaulted(vm, cryptonote::arg_data_dir) && !fs::exists(data_dir)){
auto old_data_dir = tools::get_depreciated_default_data_dir();
if (testnet) old_data_dir /= "testnet";
else if (devnet) old_data_dir /= "devnet";
if (fs::is_directory(old_data_dir))
{
if (!tools::create_directories_if_necessary(data_dir.parent_path()))
throw std::runtime_error{"Data-directory migration failed: can't create " + data_dir.parent_path().u8string()};
fs::rename(old_data_dir, data_dir);
MGINFO_CYAN("Migrated data directory from " << old_data_dir << " to " << data_dir)
#ifdef WIN32
fs::create_directory_symlink(data_dir, old_data_dir);
#endif
return true;
}
}
// After logs initialized create the data directory.
tools::create_directories_if_necessary(data_dir);
#ifdef STACK_TRACE

6
src/rpc/lmq_server.cpp
View file

@ -128,7 +128,11 @@ lmq_rpc::lmq_rpc(cryptonote::core& core, core_rpc_server& rpc, const boost::prog
// windows. In theory we could do some runtime detection to see if the Windows version is new
// enough to support unix domain sockets, but for now the Windows default is just "don't listen"
#ifndef _WIN32
locals.push_back("ipc://" + core.get_config_directory().u8string() + "/oxend.sock");
// Push default .oxen/oxend.sock
locals.push_back("ipc://" + core.get_config_directory().u8string() + "/" + CRYPTONOTE_NAME + "d.sock");
// Pushing old default lokid.sock onto the list. A symlink from .loki -> .oxen so the user should be able
// to communicate via the old .loki/lokid.sock
locals.push_back("ipc://" + core.get_config_directory().u8string() + "/lokid.sock");
#endif
} else if (locals.size() == 1 && locals[0] == "none") {
locals.clear();