twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-11 15:27:57 +00:00
Code Issues Projects Releases Wiki Activity

rework initialization order a little, try to start torrents after dht comes up

Browse Source
This commit is contained in:
Miguel Freitas 2013-10-12 17:31:49 -03:00
parent e80acded1f
commit 019da72568
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/twister.cpp
View File

@ -161,21 +161,31 @@ void ThreadWaitExtIP()
settings.anonymous_mode = false; // (false => send peer_id, avoid connecting to itself) settings.anonymous_mode = false; // (false => send peer_id, avoid connecting to itself)
ses->set_settings(settings); ses->set_settings(settings);
printf("libtorrent + dht started\n");
boost::filesystem::path userDataPath = GetDataDir() / "user_data"; // wait up to 10 seconds for dht nodes to be set
loadUserData(userDataPath.string(), m_users); for( int i = 0; i < 10; i++ ) {
printf("loaded user_data for %zd users\n", m_users.size()); MilliSleep(1000);
session_status ss = ses->status();
// now restart the user torrents (all m_following) if( ss.dht_nodes )
std::map<std::string,UserData>::const_iterator i; break;
for (i = m_users.begin(); i != m_users.end(); ++i) {
UserData const &data = i->second;
BOOST_FOREACH(string username, data.m_following) {
startTorrentUser(username);
}
} }
printf("libtorrent + dht started\n"); {
LOCK(cs_twister);
boost::filesystem::path userDataPath = GetDataDir() / "user_data";
loadUserData(userDataPath.string(), m_users);
printf("loaded user_data for %zd users\n", m_users.size());
// now restart the user torrents (all m_following)
std::map<std::string,UserData>::const_iterator i;
for (i = m_users.begin(); i != m_users.end(); ++i) {
UserData const &data = i->second;
BOOST_FOREACH(string username, data.m_following) {
startTorrentUser(username);
}
}
}
} }
void ThreadMaintainDHTNodes() void ThreadMaintainDHTNodes()
@ -183,7 +193,7 @@ void ThreadMaintainDHTNodes()
RenameThread("maintain-dht-nodes"); RenameThread("maintain-dht-nodes");
while(1) { while(1) {
MilliSleep(15000); MilliSleep(5000);
bool nodesAdded = false; bool nodesAdded = false;
if( ses ) { if( ses ) {