diff --git a/src/accounts/hatchet/account/HatchetAccount.cpp b/src/accounts/hatchet/account/HatchetAccount.cpp index 6d105395c..5884d1a07 100644 --- a/src/accounts/hatchet/account/HatchetAccount.cpp +++ b/src/accounts/hatchet/account/HatchetAccount.cpp @@ -83,7 +83,7 @@ HatchetAccount::HatchetAccount( const QString& accountId ) QFile pemFile( ":/hatchet-account/mandella.pem" ); pemFile.open( QIODevice::ReadOnly ); - tLog() << Q_FUNC_INFO << "certs/mandella.pem: " << pemFile.readAll(); + tDebug() << Q_FUNC_INFO << "certs/mandella.pem: " << pemFile.readAll(); pemFile.close(); pemFile.open( QIODevice::ReadOnly ); QCA::ConvertResult conversionResult; @@ -338,7 +338,7 @@ HatchetAccount::onFetchAccessTokensFinished() QVariantHash creds = credentials(); QStringList tokenTypesFound; - tLog() << Q_FUNC_INFO << "resp: " << resp; + tDebug() << Q_FUNC_INFO << "resp: " << resp; foreach( QVariant tokenVariant, resp[ "data" ].toMap()[ "tokens" ].toList() ) { @@ -352,7 +352,7 @@ HatchetAccount::onFetchAccessTokensFinished() creds[ tokenTypeName ] = creds[ tokenTypeName ].toList() << tokenMap; } - tLog() << Q_FUNC_INFO << "Creds: " << creds; + tDebug() << Q_FUNC_INFO << "Creds: " << creds; setCredentials( creds ); syncConfig(); @@ -408,8 +408,8 @@ HatchetAccount::parseReply( QNetworkReply* reply, bool& okRet ) const tLog() << "Error from tomahawk server response, or in parsing from json:" << resp.value( "error" ).toString() << resp; } - tLog() << Q_FUNC_INFO << "Got keys" << resp.keys(); - tLog() << Q_FUNC_INFO << "Got values" << resp.values(); + tDebug() << Q_FUNC_INFO << "Got keys" << resp.keys(); + tDebug() << Q_FUNC_INFO << "Got values" << resp.values(); okRet = true; return resp; } diff --git a/src/accounts/hatchet/sip/HatchetSip.cpp b/src/accounts/hatchet/sip/HatchetSip.cpp index fb23e3c3c..8a965a49b 100644 --- a/src/accounts/hatchet/sip/HatchetSip.cpp +++ b/src/accounts/hatchet/sip/HatchetSip.cpp @@ -48,7 +48,7 @@ HatchetSipPlugin::HatchetSipPlugin( Tomahawk::Accounts::Account *account ) QFile pemFile( ":/hatchet-account/dreamcatcher.pem" ); pemFile.open( QIODevice::ReadOnly ); - tLog() << Q_FUNC_INFO << "certs/dreamcatcher.pem: " << pemFile.readAll(); + tDebug() << Q_FUNC_INFO << "certs/dreamcatcher.pem: " << pemFile.readAll(); pemFile.close(); pemFile.open( QIODevice::ReadOnly ); QCA::ConvertResult conversionResult; @@ -212,7 +212,7 @@ HatchetSipPlugin::webSocketConnected() QCA::SecureArray sa( m_uuid.toLatin1() ); QCA::SecureArray result = m_publicKey->encrypt( sa, QCA::EME_PKCS1_OAEP ); - tLog() << Q_FUNC_INFO << "uuid:" << m_uuid << ", size of uuid:" << m_uuid.size() << ", size of sa:" << sa.size() << ", size of result:" << result.size(); + tDebug() << Q_FUNC_INFO << "uuid:" << m_uuid << ", size of uuid:" << m_uuid.size() << ", size of sa:" << sa.size() << ", size of result:" << result.size(); QVariantMap nonceVerMap; nonceVerMap[ "version" ] = VERSION; @@ -271,7 +271,7 @@ HatchetSipPlugin::sendBytes( const QVariantMap& jsonMap ) const return false; } - tLog() << Q_FUNC_INFO << "Sending bytes of size" << bytes.size(); + tDebug() << Q_FUNC_INFO << "Sending bytes of size" << bytes.size(); emit rawBytes( bytes ); return true; } @@ -280,7 +280,7 @@ HatchetSipPlugin::sendBytes( const QVariantMap& jsonMap ) const void HatchetSipPlugin::messageReceived( const QByteArray &msg ) { - tLog() << Q_FUNC_INFO << "WebSocket message: " << msg; + tDebug() << Q_FUNC_INFO << "WebSocket message: " << msg; QJson::Parser parser; bool ok; @@ -376,7 +376,7 @@ HatchetSipPlugin::messageReceived( const QByteArray &msg ) else if ( !retMap.contains( "command" ) || !retMap[ "command" ].canConvert< QString >() ) { - tLog() << Q_FUNC_INFO << "Unable to convert and/or interepret command from server"; + tDebug() << Q_FUNC_INFO << "Unable to convert and/or interepret command from server"; return; } @@ -416,7 +416,7 @@ HatchetSipPlugin::newPeer( const QVariantMap& valMap ) const QVariantList hostinfo = valMap[ "hostinfo" ].toList(); const QString dbid = valMap[ "dbid" ].toString(); - tLog() << Q_FUNC_INFO << "username:" << username << "dbid" << dbid; + tDebug() << Q_FUNC_INFO << "username:" << username << "dbid" << dbid; QStringList keys( QStringList() << "command" << "username" << "hostinfo" << "dbid" ); if ( !checkKeys( keys, valMap ) ) @@ -471,7 +471,7 @@ HatchetSipPlugin::sendSipInfos(const Tomahawk::peerinfo_ptr& receiver, const QLi } const QString dbid = receiver->data().toMap().value( "dbid" ).toString(); - tLog() << Q_FUNC_INFO << "Send local info to " << receiver->friendlyName() << "(" << dbid << ") we are" << infos[ 0 ].nodeId() << "with offerkey " << infos[ 0 ].key(); + tDebug() << Q_FUNC_INFO << "Send local info to " << receiver->friendlyName() << "(" << dbid << ") we are" << infos[ 0 ].nodeId() << "with offerkey " << infos[ 0 ].key(); QVariantMap sendMap; sendMap[ "command" ] = "authorize-peer"; @@ -486,7 +486,7 @@ HatchetSipPlugin::sendSipInfos(const Tomahawk::peerinfo_ptr& receiver, const QLi void HatchetSipPlugin::peerAuthorization( const QVariantMap& valMap ) { - tLog() << Q_FUNC_INFO << "dbid:" << valMap[ "dbid" ].toString() << "offerkey" << valMap[ "offerkey" ].toString(); + tDebug() << Q_FUNC_INFO << "dbid:" << valMap[ "dbid" ].toString() << "offerkey" << valMap[ "offerkey" ].toString(); QStringList keys( QStringList() << "command" << "dbid" << "offerkey" ); if ( !checkKeys( keys, valMap ) ) @@ -538,7 +538,7 @@ HatchetSipPlugin::dbSyncTriggered() void HatchetSipPlugin::sendOplog( const QVariantMap& valMap ) const { - tLog() << Q_FUNC_INFO; + tDebug() << Q_FUNC_INFO; DatabaseCommand_loadOps* cmd = new DatabaseCommand_loadOps( SourceList::instance()->getLocal(), valMap[ "lastrevision" ].toString() ); connect( cmd, SIGNAL( done( QString, QString, QList< dbop_ptr > ) ), SLOT( oplogFetched( QString, QString, QList< dbop_ptr > ) ) ); Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) ); @@ -546,9 +546,9 @@ HatchetSipPlugin::sendOplog( const QVariantMap& valMap ) const void -HatchetSipPlugin::oplogFetched( const QString& sinceguid, const QString& /* lastguid */, const QList< dbop_ptr > ops ) const +HatchetSipPlugin::oplogFetched( const QString& sinceguid, const QString& /* lastguid */, const QList< dbop_ptr > ops ) { - tLog() << Q_FUNC_INFO; + tDebug() << Q_FUNC_INFO; const uint_fast32_t byteMax = 1 << 25; int currBytes = 0; QVariantMap commandMap; @@ -556,7 +556,7 @@ HatchetSipPlugin::oplogFetched( const QString& sinceguid, const QString& /* last commandMap[ "startingrevision" ] = sinceguid; currBytes += 60; //baseline for quotes, keys, commas, colons, etc. QVariantList revisions; - tLog() << Q_FUNC_INFO << "Found" << ops.size() << "ops"; + tDebug() << Q_FUNC_INFO << "Found" << ops.size() << "ops"; foreach( const dbop_ptr op, ops ) { currBytes += 80; //baseline for quotes, keys, commas, colons, etc. @@ -586,7 +586,7 @@ HatchetSipPlugin::oplogFetched( const QString& sinceguid, const QString& /* last else revisions << revMap; } - tLog() << Q_FUNC_INFO << "Sending" << revisions.size() << "revisions"; + tDebug() << Q_FUNC_INFO << "Sending" << revisions.size() << "revisions"; commandMap[ "revisions" ] = revisions; if ( !sendBytes( commandMap ) ) @@ -596,8 +596,8 @@ HatchetSipPlugin::oplogFetched( const QString& sinceguid, const QString& /* last rescueMap[ "command" ] = "oplog"; if ( !sendBytes( rescueMap ) ) { - tLog() << Q_FUNC_INFO << "Failed to send rescue map; state may be out-of-sync with server"; - //FIXME: Do we want to disconnect and reconnect at this point to try to get sending working and clear the server state? + tLog() << Q_FUNC_INFO << "Failed to send rescue map; state may be out-of-sync with server; reconnecting"; + disconnectPlugin(); } } } diff --git a/src/accounts/hatchet/sip/HatchetSip.h b/src/accounts/hatchet/sip/HatchetSip.h index a33755403..7ade8c967 100644 --- a/src/accounts/hatchet/sip/HatchetSip.h +++ b/src/accounts/hatchet/sip/HatchetSip.h @@ -72,7 +72,7 @@ private slots: void dbSyncTriggered(); void messageReceived( const QByteArray& msg ); void connectWebSocket(); - void oplogFetched( const QString& sinceguid, const QString& lastguid, const QList< dbop_ptr > ops ) const; + void oplogFetched( const QString& sinceguid, const QString& lastguid, const QList< dbop_ptr > ops ); private: bool sendBytes( const QVariantMap& jsonMap ) const; diff --git a/src/accounts/hatchet/sip/WebSocket.cpp b/src/accounts/hatchet/sip/WebSocket.cpp index 428de5103..bbbe70b63 100644 --- a/src/accounts/hatchet/sip/WebSocket.cpp +++ b/src/accounts/hatchet/sip/WebSocket.cpp @@ -211,16 +211,16 @@ WebSocket::readOutput() if ( !m_connection ) return; - tLog() << Q_FUNC_INFO; + tDebug() << Q_FUNC_INFO; std::string outputString = m_outputStream.str(); if ( outputString.size() > 0 ) { m_outputStream.str(""); - tLog() << Q_FUNC_INFO << "Got string of size" << outputString.size() << "from ostream"; + tDebug() << Q_FUNC_INFO << "Got string of size" << outputString.size() << "from ostream"; qint64 sizeWritten = m_socket->write( outputString.data(), outputString.size() ); - tLog() << Q_FUNC_INFO << "Wrote" << sizeWritten << "bytes to the socket"; + tDebug() << Q_FUNC_INFO << "Wrote" << sizeWritten << "bytes to the socket"; if ( sizeWritten == -1 ) { tLog() << Q_FUNC_INFO << "Error during writing, closing connection"; @@ -235,7 +235,7 @@ WebSocket::readOutput() { foreach( QByteArray message, m_queuedMessagesToSend ) { - tLog() << Q_FUNC_INFO << "Sending queued message of size" << message.size(); + tDebug() << Q_FUNC_INFO << "Sending queued message of size" << message.size(); m_connection->send( std::string( message.constData(), message.size() ), websocketpp::frame::opcode::TEXT ); } @@ -253,7 +253,7 @@ WebSocket::readOutput() void WebSocket::socketReadyRead() { - tLog() << Q_FUNC_INFO; + tDebug() << Q_FUNC_INFO; if ( !m_socket || !m_socket->isEncrypted() ) return; @@ -267,11 +267,11 @@ WebSocket::socketReadyRead() if ( qint64 bytes = m_socket->bytesAvailable() ) { - tLog() << Q_FUNC_INFO << "Bytes available:" << bytes; + tDebug() << Q_FUNC_INFO << "Bytes available:" << bytes; QByteArray buf; buf.resize( bytes ); qint64 bytesRead = m_socket->read( buf.data(), bytes ); - tLog() << Q_FUNC_INFO << "Bytes read:" << bytesRead; // << ", content is" << websocketpp::utility::to_hex( buf.constData(), bytesRead ).data(); + tDebug() << Q_FUNC_INFO << "Bytes read:" << bytesRead; // << ", content is" << websocketpp::utility::to_hex( buf.constData(), bytesRead ).data(); if ( bytesRead != bytes ) { tLog() << Q_FUNC_INFO << "Error occurred during socket read. Something is wrong; disconnecting"; @@ -289,7 +289,7 @@ WebSocket::socketReadyRead() void WebSocket::encodeMessage( const QByteArray &bytes ) { - tLog() << Q_FUNC_INFO << "Encoding message"; //, message is" << bytes.constData(); + tDebug() << Q_FUNC_INFO << "Encoding message"; //, message is" << bytes.constData(); if ( !m_connection ) { tLog() << Q_FUNC_INFO << "Asked to send message but do not have a valid connection!"; @@ -311,7 +311,7 @@ WebSocket::encodeMessage( const QByteArray &bytes ) void onMessage( WebSocket* ws, websocketpp::connection_hdl, hatchet_client::message_ptr msg ) { - tLog() << Q_FUNC_INFO << "Handling message"; + tDebug() << Q_FUNC_INFO << "Handling message"; std::string payload = msg->get_payload(); ws->decodedMessage( QByteArray( payload.data(), payload.length() ) ); } @@ -319,6 +319,6 @@ onMessage( WebSocket* ws, websocketpp::connection_hdl, hatchet_client::message_p void onClose( WebSocket *ws, websocketpp::connection_hdl ) { - tLog() << Q_FUNC_INFO << "Handling message"; + tDebug() << Q_FUNC_INFO << "Handling message"; QMetaObject::invokeMethod( ws, "disconnectSocket", Qt::QueuedConnection ); }