4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-14 20:36:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #522

Browse Source 
34e3889 p2p: failure to load p2pstate.bin is not fatal anymore (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-12-08 20:10:01 +02:00
commit e7872656bc
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/p2p/net_node.inl
View File

@ -134,8 +134,17 @@ namespace nodetool
p2p_data.open( state_file_path , std::ios_base::binary | std::ios_base::in);
if(!p2p_data.fail())
{
boost::archive::binary_iarchive a(p2p_data);
a >> *this;
try
{
boost::archive::binary_iarchive a(p2p_data);
a >> *this;
}
catch (const std::exception &e)
{
LOG_ERROR("Failed to load p2p config file, falling back to default config");
m_peerlist = peerlist_manager(); // it was probably half clobbered by the failed load
make_default_config();
}
}else
{
make_default_config();