Changeset 2304

Timestamp:

01/18/08 16:15:45 (12 months ago)

Author:

edmanm

Message:

r42@lysithea: edmanm | 2008-01-18 16:15:28 -0500
Reenable all the logging in src/torcontrol that I had to disable during the
re-org when we moved to CMake.

Location:

vidalia/trunk/src/torcontrol

Files:

• addressmap.cpp (modified) (2 diffs)
• controlcommand.cpp (modified) (1 diff)
• controlconnection.cpp (modified) (13 diffs)
• controlsocket.cpp (modified) (2 diffs)
• torevents.cpp (modified) (1 diff)
• torprocess.cpp (modified) (5 diffs)
• torservice.cpp (modified) (10 diffs)

vidalia/trunk/src/torcontrol/addressmap.cpp

@@ -27 +27 @@
 
 #include <QStringList>
-//#include <vidalia.h>
-
+#include "debug.h"
 #include "addressmap.h"
 
@@ -40 +39 @@
 AddressMap::add(QString from, QString to, QDateTime expires)
 {
-#if 0
-  vInfo("New address mapping: %1 -> %2 (expires %3)")
-    .arg(from).arg(to)
-    .arg(expires.isValid() ? expires.toString(DATE_FMT) : "never");
-#endif
+  log::debug("New address mapping: %1 -> %2 (expires %3)").arg(from)
+                                                          .arg(to)
+                          .arg(expires.isValid() ? expires.toString(DATE_FMT)
+                                                 : "never");
   insert(from, addr_map_entry_t(to, expires));
 }

vidalia/trunk/src/torcontrol/controlcommand.cpp

@@ -25 +25 @@
  * \brief A command sent to Tor's control interface
  */
-
 
 #include "controlcommand.h"

vidalia/trunk/src/torcontrol/controlconnection.cpp

@@ -30 +30 @@
 #include <QMutexLocker>
 #include <stringutil.h>
+#include "debug.h"
 
 #include "controlconnection.h"
@@ -60 +61 @@
 {
   if (isRunning()) {
-#if 0
-    vError("Bug: Tried to call ControlConnection::connect() when the "
-          "control thread is already running.");
-#endif
+    log::error("Bug: Tried to call ControlConnection::connect() when the "
+              "control thread is already running.");
     return;
   }
@@ -85 +84 @@
 {
   _connectAttempt++;
-#if 0
-  vInfo("Connecting to Tor (Attempt %1 of %2)").arg(_connectAttempt)
-                                               .arg(MAX_CONNECT_ATTEMPTS);
-#endif
+  log::debug("Connecting to Tor (Attempt %1 of %2)").arg(_connectAttempt)
+                                                   .arg(MAX_CONNECT_ATTEMPTS);
+  
   _connMutex.lock();
   _sock->connectToHost(_addr, _port);
@@ -133 +131 @@
     if (error == QAbstractSocket::ConnectionRefusedError &&
         _connectAttempt < MAX_CONNECT_ATTEMPTS) {
-#if 0
-      vInfo("Control connection refused. Retrying in %1ms.")
-                                                  .arg(CONNECT_RETRY_DELAY);
-#endif
+      log::debug("Control connection refused. Retrying in %1ms.")
+                                       .arg(CONNECT_RETRY_DELAY);
       _connectTimer->start(CONNECT_RETRY_DELAY);
     } else {
       /* Exceeded maximum number of connect attempts. Give up. */
       QString errstr = ControlSocket::toString(error);
-//      vWarn("Vidalia was unable to connect to Tor: %1").arg(errstr);
+      log::error("Vidalia was unable to connect to Tor: %1").arg(errstr);
       emit connectFailed(tr("Vidalia was unable to connect to Tor. (%1)")
                                                              .arg(errstr));
@@ -149 +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. */
-//    vNotice("Tor closed the control connection.");
+    log::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. */
-//    vWarn("Control socket error: %1").arg(ControlSocket::toString(error));
+    log::error("Control socket error: %1").arg(ControlSocket::toString(error));
   }
 }
@@ -162 +158 @@
 ControlConnection::cancelConnect()
 {
-//  vNotice("Control connection attempt cancelled.");
+  log::warn("Control connection attempt cancelled.");
   setStatus(Disconnected);
   exit(0);
@@ -204 +200 @@
 {
   QMutexLocker locker(&_statusMutex);
-#if 0
-  vNotice("Control connection status changed from '%1' to '%2'")
-                                    .arg(statusString(_status))
-                                    .arg(statusString(status));
-#endif
+  log::debug("Control connection status changed from '%1' to '%2'")
+                                       .arg(statusString(_status))
+                                       .arg(statusString(status));
   _status = status;
 }
@@ -228 +222 @@
     /* Wait for and get the result, clean up, and return */
     result = w->getResult(&reply, &errstr);
-//    if (!result)
-//      vWarn("Failed to receive control reply: %1").arg(errstr);
+    if (!result)
+      log::error("Failed to receive control reply: %1").arg(errstr);
     delete w;
   } else {
-//    vWarn("Failed to send control command (%1): %2")
-//      .arg(cmd.keyword()).arg(errstr);
+    log::error("Failed to send control command (%1): %2").arg(cmd.keyword())
+                                                        .arg(errstr);
     _recvMutex.unlock();
   }
@@ -254 +248 @@
   _connMutex.lock();
   if (!_sock || _status != Connected) {
-//    vDebug("Unable to send control command '%1' when socket status is '%2'")
-//                                            .arg(cmd.keyword()).arg(_status);
+    log::warn("Unable to send control command '%1' when socket status is '%2'")
+                                              .arg(cmd.keyword()).arg(_status);
     _connMutex.unlock();
     return err(errmsg, tr("Control socket is not connected."));
@@ -292 +286 @@
       if (reply.getStatus() == "650") {
         /* Asynchronous event message */
-//        vDebug("Control Event: %1").arg(reply.toString());
+        log::debug("Control Event: %1").arg(reply.toString());
         
         if (_events) {
@@ -299 +293 @@
       } else {
         /* Response to a previous command */
-//        vInfo("Control Reply: %1").arg(reply.toString());
+        log::debug("Control Reply: %1").arg(reply.toString());
         
         _recvMutex.lock();
@@ -309 +303 @@
       }
     } else {
-//      vWarn("Unable to read control reply: %1").arg(errmsg);
+      log::error("Unable to read control reply: %1").arg(errmsg);
     }
   }
@@ -376 +370 @@
   /* Attempt to connect to Tor */
   connect();
-//  vDebug("Starting control connection event loop.");
+  log::debug("Starting control connection event loop.");
   exec();
-//  vDebug("Exited control connection event loop.");
+  log::debug("Exited control connection event loop.");
 
   /* Clean up the socket */

vidalia/trunk/src/torcontrol/controlsocket.cpp

@@ -27 +27 @@
 
 #include <stringutil.h>
-//#include <vidalia.h>
+#include "debug.h"
 
 #include "controlsocket.h"
@@ -65 +65 @@
   /* Format the control command */
   QString strCmd = cmd.toString();
-//  vInfo("Control Command: %1").arg(strCmd.trimmed());
+  log::debug("Control Command: %1").arg(strCmd.trimmed());
 
   /* Attempt to send the command to Tor */

vidalia/trunk/src/torcontrol/torevents.cpp

@@ -28 +28 @@
 #include <QApplication>
 #include <stringutil.h>
-//#include <vidalia.h>
 
 #include "circuit.h"

vidalia/trunk/src/torcontrol/torprocess.cpp

@@ -27 +27 @@
 
 #include <QString>
-//#include <vidalia.h>
 #include <stringutil.h>
+#include "debug.h"
 
 /* Needed for _PROCESS_INFORMATION so that pid() works on Win32 */
@@ -88 +88 @@
   setEnvironment(env);
 
-//  vNotice("Starting Tor using '%1 %2'").arg(app).arg(formatArguments(args));
+  log::debug("Starting Tor using '%1 %2'").arg(app).arg(formatArguments(args));
   QProcess::start(exe, args, QIODevice::ReadOnly | QIODevice::Text);
 }
@@ -102 +102 @@
   }
 
-//  vNotice("Stopping the Tor process.");
+  log::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)) {
-//    vWarn("Tor failed to stop: %1").arg(errorString());
+    log::error("Tor failed to stop: %1").arg(errorString());
     if (errmsg) {
       *errmsg = 
@@ -182 +182 @@
 {
   if (error == QProcess::FailedToStart) {
-//    vWarn("The Tor process failed to start: %1").arg(errorString());
+    log::error("The Tor process failed to start: %1").arg(errorString());
     /* Tor didn't start, so let everyone know why. */
     emit startFailed(errorString());
   } else {
-//    vWarn("Tor process error: %1").arg(errorString());
+    log::error("Tor process error: %1").arg(errorString());
   }
 }

vidalia/trunk/src/torcontrol/torservice.cpp

@@ -28 +28 @@
 #include <QLibrary>
 
+#include "debug.h"
 #include "torservice.h"
 
@@ -150 +151 @@
 
   if (!service) {
-//    vWarn("Bug: We tried to start the Tor service, but it is not installed.");
+    log::error("Bug: We tried to start the Tor service, but it is not installed.");
     emit startFailed(tr("The Tor service is not installed."));
     return;
@@ -158 +159 @@
   if (status() != SERVICE_RUNNING) {
     int tries = 0;
-//    vNotice("Starting the Tor service.");
+    log::debug("Starting the Tor service.");
     _service_fns.StartServiceA(service, 0, NULL);
 
@@ -168 +169 @@
     emit started();
   } else {
-//    vWarn("Unable to start the Tor service.");
+    log::error("Unable to start the Tor service.");
     emit startFailed(tr("Unable to start the Tor service."));
   }
@@ -186 +187 @@
     SERVICE_STATUS stat;
     stat.dwCurrentState = SERVICE_RUNNING;
-//    vNotice("Stopping the Tor service.");
+    log::debug("Stopping the Tor service.");
     if (_service_fns.ControlService(service, SERVICE_CONTROL_STOP, &stat)) {
       /* XXX Five seconds isn't long enough to wait when we're stopping a Tor
@@ -205 +206 @@
   }
   /* XXX This needs an actual reason message. */
-//  vWarn("Unable to stop the Tor service.");
+  log::error("Unable to stop the Tor service.");
   return false;
 }
@@ -262 +263 @@
                                                  .arg(controlPort);
 
-//    vNotice("Installing the Tor service using the command line '%1'")
-//                                                        .arg(command);
+    log::debug("Installing the Tor service using the command line '%1'")
+                                                          .arg(command);
     service = _service_fns.CreateServiceA(_scm, 
                               (LPCTSTR)TOR_SERVICE_NAME, (LPCTSTR)TOR_SERVICE_DISP,
@@ -272 +273 @@
     if (!service) {
       /* XXX This needs an actual reason message. */
-//      vWarn("Failed to install the Tor service.");
+      log::error("Failed to install the Tor service.");
       return false;
     }
@@ -295 +296 @@
   if (service) {
     stop();
-//    vNotice("Removing the Tor service.");
+    log::debug("Removing the Tor service.");
     removed = _service_fns.DeleteService(service);
     closeHandle(service);
@@ -301 +302 @@
   if (!removed) {
     /* XXX This needs an actual reason message. */
-//    vWarn("Failed to remove the Tor service.");
+    log::error("Failed to remove the Tor service.");
   }
   return removed;