feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Trk: Improve error handling.

Browse Source
This commit is contained in:
Friedemann Kleint
2009-07-28 16:31:35 +02:00
parent 20cac566f9
commit 4d70da872a
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/manual/trk/trkserver.cpp
View File

@@ -118,7 +118,7 @@ public:
void setServerName(const QString &name) { m_serverName = name; } void setServerName(const QString &name) { m_serverName = name; }
void setMemoryDumpName(const QString &source) { m_memoryDumpName = source; } void setMemoryDumpName(const QString &source) { m_memoryDumpName = source; }
void setVerbose(int v) { m_verbose = v; } void setVerbose(int v) { m_verbose = v; }
void startServer(); bool startServer();
private slots: private slots:
void handleConnection(); void handleConnection();
@@ -157,25 +157,29 @@ TrkServer::~TrkServer()
m_server.close(); m_server.close();
} }
void TrkServer::startServer() bool TrkServer::startServer()
{ {
QFile file(m_memoryDumpName); QFile file(m_memoryDumpName);
file.open(QIODevice::ReadOnly); if (!file.open(QIODevice::ReadOnly)) {
logMessage(QString::fromLatin1("Unable to read %1: %2").arg(m_memoryDumpName, file.errorString()), true);
return false;
}
m_memoryData = file.readAll(); m_memoryData = file.readAll();
file.close(); file.close();
logMessage(QString("Read %1 bytes of data from %2") logMessage(QString("Read %1 bytes of data from %2")
.arg(m_memoryData.size()).arg(m_memoryDumpName)); .arg(m_memoryData.size()).arg(m_memoryDumpName), true);
m_lastSent = 0; m_lastSent = 0;
if (!m_server.listen(m_serverName)) { if (!m_server.listen(m_serverName)) {
logMessage(QString("Error: Unable to start the TRK server %1: %2.") logMessage(QString("Error: Unable to start the TRK server %1: %2.")
.arg(m_serverName).arg(m_server.errorString()), true); .arg(m_serverName).arg(m_server.errorString()), true);
return; return false;
} }
logMessage("The TRK server '" + m_serverName + "'is running. Run the adapter now.", true); logMessage("The TRK server '" + m_serverName + "'is running. Run the adapter now.", true);
connect(&m_server, SIGNAL(newConnection()), this, SLOT(handleConnection())); connect(&m_server, SIGNAL(newConnection()), this, SLOT(handleConnection()));
return true;
} }
void TrkServer::logMessage(const QString &msg, bool force) void TrkServer::logMessage(const QString &msg, bool force)
@@ -384,7 +388,8 @@ int main(int argc, char *argv[])
server.setServerName(options.serverName); server.setServerName(options.serverName);
server.setMemoryDumpName(options.dumpName); server.setMemoryDumpName(options.dumpName);
server.setVerbose(options.verbose); server.setVerbose(options.verbose);
server.startServer(); if (!server.startServer())
return -1;
return app.exec(); return app.exec();
} }