mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 14:46:33 +02:00
Code Issues Releases Wiki Activity

Add more debugging and remove the don't-try-to-reconnect behavior

Browse Source
This commit is contained in:
Jeff Mitchell
2011-03-31 15:12:08 -04:00
parent 0c4e304ee5
commit 47451e4fba
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libtomahawk/network/servent.cpp
View File

@@ -792,8 +792,11 @@ Servent::isIPWhitelisted( QHostAddress ip )
bool bool
Servent::connectedToSession( const QString& session ) Servent::connectedToSession( const QString& session )
{ {
qDebug() << Q_FUNC_INFO;
qDebug() << "Checking against " << session;
foreach( ControlConnection* cc, m_controlconnections ) foreach( ControlConnection* cc, m_controlconnections )
{ {
qDebug() << "Checking session " << cc->id();
if( cc->id() == session ) if( cc->id() == session )
return true; return true;
} }

10
src/sip/twitter/twitter.cpp
View File

@@ -178,7 +178,6 @@ TwitterPlugin::disconnectPlugin()
delete m_twitterAuth.data(); delete m_twitterAuth.data();
m_cachedPeers.empty(); m_cachedPeers.empty();
m_attemptedConnects.empty();
m_isOnline = false; m_isOnline = false;
} }
@@ -571,7 +570,6 @@ TwitterPlugin::registerOffer( const QString &screenName, const QHash< QString, Q
{ {
m_cachedPeers[screenName] = QVariant::fromValue< QHash< QString, QVariant > >( _peerData ); m_cachedPeers[screenName] = QVariant::fromValue< QHash< QString, QVariant > >( _peerData );
TomahawkSettings::instance()->setTwitterCachedPeers( m_cachedPeers ); TomahawkSettings::instance()->setTwitterCachedPeers( m_cachedPeers );
m_attemptedConnects[screenName] = false;
} }
if ( m_isOnline && _peerData.contains( "host" ) && _peerData.contains( "port" ) && _peerData.contains( "pkey" ) ) if ( m_isOnline && _peerData.contains( "host" ) && _peerData.contains( "port" ) && _peerData.contains( "pkey" ) )
@@ -597,14 +595,9 @@ void
TwitterPlugin::makeConnection( const QString &screenName, const QHash< QString, QVariant > &peerData ) TwitterPlugin::makeConnection( const QString &screenName, const QHash< QString, QVariant > &peerData )
{ {
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
if ( m_attemptedConnects.contains( screenName ) && m_attemptedConnects[screenName] )
{
qDebug() << "Already attempted to connect to " << screenName << " with no change in their status, not trying again for now";
return;
}
if ( !peerData.contains( "host" ) || !peerData.contains( "port" ) || !peerData.contains( "pkey" ) || !peerData.contains( "node" ) ) if ( !peerData.contains( "host" ) || !peerData.contains( "port" ) || !peerData.contains( "pkey" ) || !peerData.contains( "node" ) )
{ {
qDebug() << "TwitterPlugin could not find host and/or port and/or pkey for peer " << screenName; qDebug() << "TwitterPlugin could not find host and/or port and/or pkey and/or node for peer " << screenName;
return; return;
} }
QString friendlyName = QString( '@' + screenName ); QString friendlyName = QString( '@' + screenName );
@@ -614,7 +607,6 @@ TwitterPlugin::makeConnection( const QString &screenName, const QHash< QString,
peerData["pkey"].toString(), peerData["pkey"].toString(),
friendlyName, friendlyName,
peerData["node"].toString() ); peerData["node"].toString() );
m_attemptedConnects[screenName] = true;
} }
void void

1
src/sip/twitter/twitter.h
View File

@@ -108,7 +108,6 @@ private:
qint64 m_cachedMentionsSinceId; qint64 m_cachedMentionsSinceId;
qint64 m_cachedDirectMessagesSinceId; qint64 m_cachedDirectMessagesSinceId;
QHash< QString, QVariant > m_cachedPeers; QHash< QString, QVariant > m_cachedPeers;
QHash< QString, bool > m_attemptedConnects;
QSet<QString> m_keyCache; QSet<QString> m_keyCache;
bool m_finishedFriends; bool m_finishedFriends;
bool m_finishedMentions; bool m_finishedMentions;