Cleanup|Server|Client: Log levels and domains (continued)

Converted remaining Con_Message() calls in the network domain to
use LOG.

doomsday/client/src/con_main.cpp

@@ -2320,7 +2320,7 @@ D_CMD(Version)
     //Con_Printf("Homepage: %s\n", DOOMSDAY_HOMEURL);
     //Con_Printf("Project homepage: %s\n", DENGPROJECT_HOMEURL);
 
-    LOG_SCR_MSG(_E(D) DOOMSDAY_NICENAME " " DOOMSDAY_VERSION_FULLTEXT);
+    LOG_SCR_NOTE(_E(D) DOOMSDAY_NICENAME " " DOOMSDAY_VERSION_FULLTEXT);
     LOG_SCR_MSG(_E(l) "Homepage: " _E(.) _E(i) DOOMSDAY_HOMEURL _E(.)
             "\n" _E(l) "Project: " _E(.) _E(i) DENGPROJECT_HOMEURL);
 

doomsday/client/src/network/masterserver.cpp

@@ -141,23 +141,23 @@ void MasterWorker::nextJob()
         ddstring_t* msg = Str_NewStd();
         Sv_InfoToString((serverinfo_t*)job.data, msg);
 
-        LOG_NET_XVERBOSE("POST request ") << req.url().toString();
+        LOGDEV_NET_VERBOSE("POST request ") << req.url().toString();
         foreach(const QByteArray& hdr, req.rawHeaderList())
         {
-            LOG_NET_XVERBOSE("%s: %s") << QString(hdr) << QString(req.rawHeader(hdr));
+            LOGDEV_NET_VERBOSE("%s: %s") << QString(hdr) << QString(req.rawHeader(hdr));
         }
-        LOG_NET_XVERBOSE("Request contents:\n%s") << Str_Text(msg);
+        LOGDEV_NET_VERBOSE("Request contents:\n%s") << Str_Text(msg);
 
         d->network->post(req, QString(Str_Text(msg)).toUtf8());
         Str_Delete(msg);
     }
     else
 #endif
     {
-        LOG_NET_XVERBOSE("GET request ") << req.url().toString();
+        LOGDEV_NET_VERBOSE("GET request ") << req.url().toString();
         foreach(const QByteArray& hdr, req.rawHeaderList())
         {
-            LOG_NET_XVERBOSE("%s: %s") << QString(hdr) << QString(req.rawHeader(hdr));
+            LOGDEV_NET_VERBOSE("%s: %s") << QString(hdr) << QString(req.rawHeader(hdr));
         }
 
         d->network->get(req);
@@ -186,7 +186,6 @@ void MasterWorker::requestFinished(QNetworkReply* reply)
     else
     {
         LOG_NET_WARNING(reply->errorString());
-        /// @todo Log the error.
     }
 
     // Continue with the next job.

doomsday/client/src/network/net_buf.cpp

@@ -290,7 +290,7 @@ void N_SendPacket(int flags)
     }
     catch(de::Error const &er)
     {
-        LOG_NET_WARNING("N_SendPacket failed: ") << er.asText();
+        LOGDEV_NET_WARNING("N_SendPacket failed: ") << er.asText();
     }
 }
 

doomsday/client/src/network/serverlink.cpp

@@ -137,7 +137,8 @@ DENG2_PIMPL(ServerLink)
     {
         if(reply.size() < 5 || reply != "Enter")
         {
-            LOG_NET_WARNING("Server refused connection (received %i bytes instead of \"Enter\")")
+            LOG_NET_WARNING("Server refused connection");
+            LOGDEV_NET_WARNING("Received %i bytes instead of \"Enter\")")
                     << reply.size();
             self.disconnect();
             return false;

doomsday/client/src/network/ui_mpi.cpp

@@ -445,7 +445,7 @@ struct ServerDiscoveryObserver : DENG2_OBSERVES(ServerLink, DiscoveryUpdate)
     {
         if(searchMode == SEARCH_CUSTOM && UI_IsActive())
         {
-            LOG_NET_XVERBOSE("ServerDiscoveryObserver notified, updating server list");
+            LOGDEV_NET_XVERBOSE("ServerDiscoveryObserver notified, updating server list");
             MPIUpdateServerList();
         }
     }

doomsday/libdeng2/src/core/monospacelogsinkformatter.cpp

@@ -29,7 +29,7 @@ MonospaceLogSinkFormatter::MonospaceLogSinkFormatter()
 #ifdef DENG2_DEBUG
     // Debug builds include a timestamp and msg type indicator.
     _maxLength = 110;
-    _minimumIndent = 25;
+    _minimumIndent = 23;
 #endif
 }
 

doomsday/libshell/src/abstractlink.cpp

@@ -164,7 +164,7 @@ void AbstractLink::send(IByteArray const &data)
 void AbstractLink::socketConnected()
 {
     LOG_AS("AbstractLink");
-    LOG_VERBOSE("Successfully connected to server %s") << d->socket->peerAddress();
+    LOG_NET_VERBOSE("Successfully connected to server %s") << d->socket->peerAddress();
 
     initiateCommunications();
 

doomsday/server/src/remoteuser.cpp

@@ -60,7 +60,7 @@ DENG2_PIMPL(RemoteUser)
         address = socket->peerAddress();
         isFromLocal = socket->isLocal();
 
-        LOG_VERBOSE("New remote user %s from socket %s (local:%b)")
+        LOG_NET_MSG("New remote user %s from socket %s (local:%b)")
                 << id << address << isFromLocal;
     }
 
@@ -133,7 +133,7 @@ DENG2_PIMPL(RemoteUser)
             Str_Appendf(&msg, "Info\n");
             Sv_InfoToString(&info, &msg);
 
-            LOG_DEBUG("Info reply:\n%s") << Str_Text(&msg);
+            LOGDEV_NET_VERBOSE("Info reply:\n%s") << Str_Text(&msg);
 
             self << ByteRefArray(Str_Text(&msg), Str_Length(&msg));
 
@@ -201,7 +201,7 @@ DENG2_PIMPL(RemoteUser)
         else
         {
             // Too bad, scoundrel! Goodbye.
-            LOG_WARNING("Received an invalid request from %s.") << id;
+            LOG_NET_WARNING("Received an invalid request from %s") << id;
             self.deleteLater();
             return false;
         }

doomsday/server/src/server/sv_frame.cpp

@@ -114,6 +114,8 @@ void Sv_TransmitFrame(void)
     }
     lastTransmitTic = SECONDS_TO_TICKS(gameTime);
 
+    LOG_AS("Sv_TransmitFrame");
+
     // Generate new deltas for the frame.
     Sv_GenerateFrameDeltas();
 
@@ -155,13 +157,11 @@ void Sv_TransmitFrame(void)
 
             Sv_SendFrame(i);
         }
-#ifdef _DEBUG
         else
         {
-            Con_Message("Sv_TransmitFrame: NOT sending at tic %i to plr %i (ready:%i)", lastTransmitTic, i,
-                        clients[i].ready);
+            LOG_NET_XVERBOSE("NOT sending at tic %i to plr %i (ready:%b)")
+                    << lastTransmitTic << i << clients[i].ready;
         }
-#endif
     }
 }
 
@@ -178,8 +178,7 @@ if(totalFrameCount > 0)
     // Byte probabilities.
     for(i = 0; i < 256; ++i)
     {
-        Con_Printf("Byte %02x: %f\n", i,
-                   byteCounts[i] / (float) totalFrameCount);
+        LOGDEV_NET_NOTE("Byte %02x: %f") << i << (byteCounts[i] / (float) totalFrameCount);
     }
 }
 #endif
@@ -257,16 +256,8 @@ void Sv_WriteMobjDelta(const void* deltaPtr)
     }
     */
 
-#ifdef _DEBUG
-    if(df & MDFC_NULL)
-    {
-        Con_Error("Sv_WriteMobjDelta: We don't write Null deltas.\n");
-    }
-    if((df & 0xffff) == 0)
-    {
-        Con_Printf("Sv_WriteMobjDelta: This delta id%i [%x] is empty.\n", delta->delta.id, df);
-    }
-#endif
+    DENG_ASSERT(!(df & MDFC_NULL));     // don't write NULL deltas
+    DENG_ASSERT((df & 0xffff) != 0);    // don't write empty deltas
 
     // First the mobj ID number and flags.
     Writer_WriteUInt16(msgWriter, delta->delta.id);
@@ -411,9 +402,7 @@ void Sv_WritePlayerDelta(const void* deltaPtr)
     if(df & PDF_FILTER)
     {
         Writer_WriteUInt32(msgWriter, d->filter);
-#ifdef _DEBUG
-        Con_Message("Sv_WritePlayerDelta: Plr %i, filter %08x", delta->delta.id, d->filter);
-#endif
+        LOGDEV_NET_XVERBOSE_DEBUGONLY("Sv_WritePlayerDelta: Plr %i, filter %08x", delta->delta.id << d->filter);
     }
     if(df & PDF_PSPRITES)       // Only set if there's something to write.
     {