Changeset 2339

Timestamp:

02/06/08 00:32:54 (11 months ago)

Author:

edmanm

Message:

r107@lysithea: edmanm | 2008-02-06 00:32:48 -0500
Rename the log namespace so we don't clash with log(double) on panther.

Location:

vidalia/trunk/src/torcontrol

Files:

• addressmap.cpp (modified) (1 diff)
• controlconnection.cpp (modified) (13 diffs)
• controlsocket.cpp (modified) (1 diff)
• debug.h (modified) (1 diff)
• torprocess.cpp (modified) (4 diffs)

vidalia/trunk/src/torcontrol/addressmap.cpp

@@ -39 +39 @@
 AddressMap::add(QString from, QString to, QDateTime expires)
 {
-  log::debug("New address mapping: %1 -> %2 (expires %3)").arg(from)
+  tc::debug("New address mapping: %1 -> %2 (expires %3)").arg(from)
                                                           .arg(to)
                           .arg(expires.isValid() ? expires.toString(DATE_FMT)

vidalia/trunk/src/torcontrol/controlconnection.cpp

@@ -61 +61 @@
 {
   if (isRunning()) {
-    log::error("Bug: Tried to call ControlConnection::connect() when the "
+    tc::error("Bug: Tried to call ControlConnection::connect() when the "
               "control thread is already running.");
     return;
@@ -84 +84 @@
 {
   _connectAttempt++;
-  log::debug("Connecting to Tor (Attempt %1 of %2)").arg(_connectAttempt)
+  tc::debug("Connecting to Tor (Attempt %1 of %2)").arg(_connectAttempt)
                                                    .arg(MAX_CONNECT_ATTEMPTS);
   
@@ -131 +131 @@
     if (error == QAbstractSocket::ConnectionRefusedError &&
         _connectAttempt < MAX_CONNECT_ATTEMPTS) {
-      log::debug("Control connection refused. Retrying in %1ms.")
+      tc::debug("Control connection refused. Retrying in %1ms.")
                                        .arg(CONNECT_RETRY_DELAY);
       _connectTimer->start(CONNECT_RETRY_DELAY);
@@ -137 +137 @@
       /* Exceeded maximum number of connect attempts. Give up. */
       QString errstr = ControlSocket::toString(error);
-      log::error("Vidalia was unable to connect to Tor: %1").arg(errstr);
+      tc::error("Vidalia was unable to connect to Tor: %1").arg(errstr);
       emit connectFailed(tr("Vidalia was unable to connect to Tor. (%1)")
                                                              .arg(errstr));
@@ -145 +145 @@
     /* Tor closed the connection. This is common when we send a 'shutdown' or
      * 'halt' signal to Tor and doesn't need to be logged as loudly. */
-    log::warn("Tor closed the control connection.");
+    tc::warn("Tor closed the control connection.");
   } else {
     /* Some other error. */
     /*XXX We may want to be emitting these so the GUI thread can learn about
      * them and display an error message. */
-    log::error("Control socket error: %1").arg(ControlSocket::toString(error));
+    tc::error("Control socket error: %1").arg(ControlSocket::toString(error));
   }
 }
@@ -158 +158 @@
 ControlConnection::cancelConnect()
 {
-  log::warn("Control connection attempt cancelled.");
+  tc::warn("Control connection attempt cancelled.");
   setStatus(Disconnected);
   exit(0);
@@ -200 +200 @@
 {
   QMutexLocker locker(&_statusMutex);
-  log::debug("Control connection status changed from '%1' to '%2'")
+  tc::debug("Control connection status changed from '%1' to '%2'")
                                        .arg(statusString(_status))
                                        .arg(statusString(status));
@@ -223 +223 @@
     result = w->getResult(&reply, &errstr);
     if (!result)
-      log::error("Failed to receive control reply: %1").arg(errstr);
+      tc::error("Failed to receive control reply: %1").arg(errstr);
     delete w;
   } else {
-    log::error("Failed to send control command (%1): %2").arg(cmd.keyword())
+    tc::error("Failed to send control command (%1): %2").arg(cmd.keyword())
                                                         .arg(errstr);
     _recvMutex.unlock();
@@ -248 +248 @@
   _connMutex.lock();
   if (!_sock || _status != Connected) {
-    log::warn("Unable to send control command '%1' when socket status is '%2'")
+    tc::warn("Unable to send control command '%1' when socket status is '%2'")
                                               .arg(cmd.keyword()).arg(_status);
     _connMutex.unlock();
@@ -286 +286 @@
       if (reply.getStatus() == "650") {
         /* Asynchronous event message */
-        log::debug("Control Event: %1").arg(reply.toString());
+        tc::debug("Control Event: %1").arg(reply.toString());
         
         if (_events) {
@@ -293 +293 @@
       } else {
         /* Response to a previous command */
-        log::debug("Control Reply: %1").arg(reply.toString());
+        tc::debug("Control Reply: %1").arg(reply.toString());
         
         _recvMutex.lock();
@@ -303 +303 @@
       }
     } else {
-      log::error("Unable to read control reply: %1").arg(errmsg);
+      tc::error("Unable to read control reply: %1").arg(errmsg);
     }
   }
@@ -370 +370 @@
   /* Attempt to connect to Tor */
   connect();
-  log::debug("Starting control connection event loop.");
+  tc::debug("Starting control connection event loop.");
   exec();
-  log::debug("Exited control connection event loop.");
+  tc::debug("Exited control connection event loop.");
 
   /* Clean up the socket */

vidalia/trunk/src/torcontrol/controlsocket.cpp

@@ -65 +65 @@
   /* Format the control command */
   QString strCmd = cmd.toString();
-  log::debug("Control Command: %1").arg(strCmd.trimmed());
+  tc::debug("Control Command: %1").arg(strCmd.trimmed());
 
   /* Attempt to send the command to Tor */

vidalia/trunk/src/torcontrol/debug.h

@@ -34 +34 @@
 
 
-namespace log {
+namespace tc {
 
 class Message {

vidalia/trunk/src/torcontrol/torprocess.cpp

@@ -88 +88 @@
   setEnvironment(env);
 
-  log::debug("Starting Tor using '%1 %2'").arg(app).arg(formatArguments(args));
+  tc::debug("Starting Tor using '%1 %2'").arg(app).arg(formatArguments(args));
   QProcess::start(exe, args, QIODevice::ReadOnly | QIODevice::Text);
 }
@@ -102 +102 @@
   }
 
-  log::debug("Stopping the Tor process.");
+  tc::debug("Stopping the Tor process.");
   /* Tell the process to stop */
 #if defined(Q_OS_WIN32)
@@ -113 +113 @@
   /* Wait for it to complete */
   if (!waitForFinished(5000)) {
-    log::error("Tor failed to stop: %1").arg(errorString());
+    tc::error("Tor failed to stop: %1").arg(errorString());
     if (errmsg) {
       *errmsg = 
@@ -182 +182 @@
 {
   if (error == QProcess::FailedToStart) {
-    log::error("The Tor process failed to start: %1").arg(errorString());
+    tc::error("The Tor process failed to start: %1").arg(errorString());
     /* Tor didn't start, so let everyone know why. */
     emit startFailed(errorString());
   } else {
-    log::error("Tor process error: %1").arg(errorString());
+    tc::error("Tor process error: %1").arg(errorString());
   }
 }