[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1838: Add a little bit of helpful logging. (in trunk: . src/control)
Author: edmanm
Date: 2007-08-21 00:33:02 -0400 (Tue, 21 Aug 2007)
New Revision: 1838
Modified:
trunk/
trunk/src/control/controlcommand.h
trunk/src/control/controlconnection.cpp
Log:
r1999@adrastea: edmanm | 2007-08-20 16:30:48 -0400
Add a little bit of helpful logging.
Property changes on: trunk
___________________________________________________________________
svk:merge ticket from /vidalia/local/trunk [r1999] on 54b3572a-7227-0410-958f-53ecd705b71a
Modified: trunk/src/control/controlcommand.h
===================================================================
--- trunk/src/control/controlcommand.h 2007-08-20 19:56:11 UTC (rev 1837)
+++ trunk/src/control/controlcommand.h 2007-08-21 04:33:02 UTC (rev 1838)
@@ -39,6 +39,9 @@
ControlCommand(QString keyword, QString arg);
ControlCommand(QString keyword, QStringList args);
+ /** Returns the keyword for this control command. */
+ QString keyword() const { return _keyword; }
+
/** Set the keyword for this control command */
void setKeyword(QString keyword);
Modified: trunk/src/control/controlconnection.cpp
===================================================================
--- trunk/src/control/controlconnection.cpp 2007-08-20 19:56:11 UTC (rev 1837)
+++ trunk/src/control/controlconnection.cpp 2007-08-21 04:33:02 UTC (rev 1838)
@@ -156,7 +156,8 @@
vWarn("Failed to receive control reply: %1").arg(errstr);
delete w;
} else {
- vWarn("Failed to send control command: %1").arg(errstr);
+ vWarn("Failed to send control command (%1): %2")
+ .arg(cmd.keyword()).arg(errstr);
_recvMutex.unlock();
}