mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-01 03:40:16 +02:00
Code Issues Releases Wiki Activity

Remove some debugging

Browse Source
This commit is contained in:
Jeff Mitchell
2011-11-18 17:34:29 -05:00
parent 7cc4632761
commit ed11593b16
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/network/connection.cpp
View File

@@ -82,7 +82,6 @@ Connection::handleIncomingQueueEmpty()
// << "m_peer_disconnected" << m_peer_disconnected // << "m_peer_disconnected" << m_peer_disconnected
// << "bytes rx" << bytesReceived(); // << "bytes rx" << bytesReceived();
tDebug() << Q_FUNC_INFO << "m_sock peer address: " << m_sock->peerAddress().toIPv4Address();
if( !m_sock.isNull() && m_sock->bytesAvailable() == 0 && m_peer_disconnected ) if( !m_sock.isNull() && m_sock->bytesAvailable() == 0 && m_peer_disconnected )
{ {
qDebug() << "No more data to read, peer disconnected. shutting down connection." qDebug() << "No more data to read, peer disconnected. shutting down connection."
@@ -153,7 +152,6 @@ Connection::actualShutdown()
if ( !m_sock.isNull() && m_sock->isOpen() ) if ( !m_sock.isNull() && m_sock->isOpen() )
{ {
tDebug() << Q_FUNC_INFO << "m_sock peer address: " << m_sock->peerAddress().toIPv4Address();
m_sock->disconnectFromHost(); m_sock->disconnectFromHost();
} }
@@ -179,7 +177,6 @@ Connection::start( QTcpSocket* sock )
Q_ASSERT( sock->isValid() ); Q_ASSERT( sock->isValid() );
m_sock = sock; m_sock = sock;
tDebug() << Q_FUNC_INFO << "m_sock peer address: " << m_sock->peerAddress().toIPv4Address();
if( m_name.isEmpty() ) if( m_name.isEmpty() )
{ {
@@ -229,7 +226,6 @@ Connection::doSetup()
m_statstimer_mark.start(); m_statstimer_mark.start();
m_sock->moveToThread( thread() ); m_sock->moveToThread( thread() );
tDebug() << Q_FUNC_INFO << "m_sock peer address: " << m_sock->peerAddress().toIPv4Address();
connect( m_sock.data(), SIGNAL( bytesWritten( qint64 ) ), connect( m_sock.data(), SIGNAL( bytesWritten( qint64 ) ),
SLOT( bytesWritten( qint64 ) ), Qt::QueuedConnection ); SLOT( bytesWritten( qint64 ) ), Qt::QueuedConnection );
@@ -270,7 +266,6 @@ Connection::socketDisconnected()
<< "bytesavail:" << m_sock->bytesAvailable() << "bytesavail:" << m_sock->bytesAvailable()
<< "bytesRecvd" << bytesReceived(); << "bytesRecvd" << bytesReceived();
tDebug() << Q_FUNC_INFO << "m_sock peer address: " << m_sock->peerAddress().toIPv4Address();
m_peer_disconnected = true; m_peer_disconnected = true;
emit socketClosed(); emit socketClosed();
@@ -431,7 +426,6 @@ Connection::sendMsg_now( msg_ptr msg )
Q_ASSERT( QThread::currentThread() == thread() ); Q_ASSERT( QThread::currentThread() == thread() );
// Q_ASSERT( this->isRunning() ); // Q_ASSERT( this->isRunning() );
tDebug() << Q_FUNC_INFO << "m_sock peer address: " << m_sock->peerAddress().toIPv4Address();
if ( m_sock.isNull() || !m_sock->isOpen() || !m_sock->isWritable() ) if ( m_sock.isNull() || !m_sock->isOpen() || !m_sock->isWritable() )
{ {
qDebug() << "***** Socket problem, whilst in sendMsg(). Cleaning up. *****"; qDebug() << "***** Socket problem, whilst in sendMsg(). Cleaning up. *****";

6
src/libtomahawk/network/controlconnection.cpp
View File

@@ -82,7 +82,6 @@ ControlConnection::clone()
void void
ControlConnection::setup() ControlConnection::setup()
{ {
tDebug() << Q_FUNC_INFO << "m_sock peer address: " << m_sock->peerAddress().toIPv4Address();
qDebug() << Q_FUNC_INFO << id() << name(); qDebug() << Q_FUNC_INFO << id() << name();
if ( !m_source.isNull() ) if ( !m_source.isNull() )
@@ -126,7 +125,6 @@ ControlConnection::setup()
void void
ControlConnection::registerSource() ControlConnection::registerSource()
{ {
tDebug() << Q_FUNC_INFO << "m_sock peer address: " << m_sock->peerAddress().toIPv4Address();
qDebug() << Q_FUNC_INFO << m_source->id(); qDebug() << Q_FUNC_INFO << m_source->id();
Source* source = (Source*) sender(); Source* source = (Source*) sender();
Q_UNUSED( source ) Q_UNUSED( source )
@@ -149,7 +147,6 @@ ControlConnection::registerSource()
void void
ControlConnection::setupDbSyncConnection( bool ondemand ) ControlConnection::setupDbSyncConnection( bool ondemand )
{ {
tDebug() << Q_FUNC_INFO << "m_sock peer address: " << m_sock->peerAddress().toIPv4Address();
qDebug() << Q_FUNC_INFO << ondemand << m_source->id() << m_dbconnkey << m_dbsyncconn << m_registered; qDebug() << Q_FUNC_INFO << ondemand << m_source->id() << m_dbconnkey << m_dbsyncconn << m_registered;
if ( m_dbsyncconn || !m_registered ) if ( m_dbsyncconn || !m_registered )
@@ -192,7 +189,6 @@ ControlConnection::setupDbSyncConnection( bool ondemand )
void void
ControlConnection::dbSyncConnFinished( QObject* c ) ControlConnection::dbSyncConnFinished( QObject* c )
{ {
tDebug() << Q_FUNC_INFO << "m_sock peer address: " << m_sock->peerAddress().toIPv4Address();
qDebug() << Q_FUNC_INFO << "DBSync connection closed (for now)"; qDebug() << Q_FUNC_INFO << "DBSync connection closed (for now)";
if( (DBSyncConnection*)c == m_dbsyncconn ) if( (DBSyncConnection*)c == m_dbsyncconn )
{ {
@@ -207,7 +203,6 @@ ControlConnection::dbSyncConnFinished( QObject* c )
DBSyncConnection* DBSyncConnection*
ControlConnection::dbSyncConnection() ControlConnection::dbSyncConnection()
{ {
tDebug() << Q_FUNC_INFO << "m_sock peer address: " << m_sock->peerAddress().toIPv4Address();
qDebug() << Q_FUNC_INFO << m_source->id(); qDebug() << Q_FUNC_INFO << m_source->id();
if ( !m_dbsyncconn ) if ( !m_dbsyncconn )
{ {
@@ -222,7 +217,6 @@ ControlConnection::dbSyncConnection()
void void
ControlConnection::handleMsg( msg_ptr msg ) ControlConnection::handleMsg( msg_ptr msg )
{ {
tDebug() << Q_FUNC_INFO << "m_sock peer address: " << m_sock->peerAddress().toIPv4Address();
if ( msg->is( Msg::PING ) ) if ( msg->is( Msg::PING ) )
{ {
// qDebug() << "Received Connection PING, nice." << m_pingtimer_mark.elapsed(); // qDebug() << "Received Connection PING, nice." << m_pingtimer_mark.elapsed();