Shell|libshell: Updated logging with domain-specific LOG macros

Also, tweaked the entry levels to be more suitable within the domain.
skyjake · Jan 4, 2014 · 29c5625 · 29c5625
1 parent ce7572f
commit 29c5625
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/doomsday/libshell/src/abstractlink.cpp b/doomsday/libshell/src/abstractlink.cpp
@@ -193,11 +193,11 @@ void AbstractLink::socketDisconnected()
     {
         if(!d->peerAddress.isNull())
         {
-            LOG_INFO("Disconnected from %s") << d->peerAddress;
+            LOG_NET_NOTE("Disconnected from %s") << d->peerAddress;
         }
         else
         {
-            LOG_INFO("Disconnected");
+            LOG_NET_NOTE("Disconnected");
         }
     }
 

diff --git a/doomsday/libshell/src/localserver.cpp b/doomsday/libshell/src/localserver.cpp
@@ -136,7 +136,7 @@ void LocalServer::start(duint16 port, String const &gameMode, QStringList additi
 
     foreach(String opt, additionalOptions) cmd.append(opt);
 
-    LOG_INFO("Starting local server with port %i using game mode '%s'")
+    LOG_NET_NOTE("Starting local server with port %i using game mode '%s'")
             << port << gameMode;
 
     cmd.execute();

diff --git a/doomsday/server/src/remoteuser.cpp b/doomsday/server/src/remoteuser.cpp
@@ -81,7 +81,7 @@ DENG2_PIMPL(RemoteUser)
     {
         if(state == Disconnected) return;
 
-        LOG_INFO("Closing connection to remote user %s (from %s)") << id << address;
+        LOG_NET_NOTE("Closing connection to remote user %s (from %s)") << id << address;
         DENG2_ASSERT(socket->isOpen());
 
         if(state == Joined)

diff --git a/doomsday/server/src/server/sv_main.cpp b/doomsday/server/src/server/sv_main.cpp
@@ -581,7 +581,7 @@ void Sv_GetPackets(void)
 boolean Sv_PlayerArrives(unsigned int nodeID, char const *name)
 {
     LOG_AS("Sv_PlayerArrives");
-    LOG_INFO("'%s' has arrived.") << name;
+    LOG_NET_NOTE("'%s' has arrived") << name;
 
     // We need to find the new player a client entry.
     for(int i = 1; i < DDMAXPLAYERS; ++i)

diff --git a/doomsday/server/src/serversystem.cpp b/doomsday/server/src/serversystem.cpp
@@ -83,7 +83,7 @@ DENG2_PIMPL(ServerSystem)
     {
         // Note: re-initialization is allowed, so we don't check for inited now.
 
-        LOG_INFO("Server listening on TCP port ") << port;
+        LOG_NET_NOTE("Server listening on TCP port %i") << port;
 
         deinit();
 

diff --git a/doomsday/server/src/shellusers.cpp b/doomsday/server/src/shellusers.cpp
@@ -61,7 +61,7 @@ ShellUsers::~ShellUsers()
 
 void ShellUsers::add(ShellUser *user)
 {
-    LOG_INFO("New shell user from %s") << user->address();
+    LOG_NET_NOTE("New shell user from %s") << user->address();
 
     d->users.insert(user);
     connect(user, SIGNAL(disconnected()), this, SLOT(userDisconnected()));
@@ -101,7 +101,7 @@ void ShellUsers::userDisconnected()
     ShellUser *user = static_cast<ShellUser *>(sender());
     d->users.remove(user);
 
-    LOG_INFO("Shell user from %s has disconnected") << user->address();
+    LOG_NET_NOTE("Shell user from %s has disconnected") << user->address();
 
     user->deleteLater();
 }
diff --git a/doomsday/tools/shell/shell-gui/src/linkwindow.cpp b/doomsday/tools/shell/shell-gui/src/linkwindow.cpp
@@ -482,7 +482,7 @@ void LinkWindow::sendCommandToServer(de::String command)
     if(d->link)
     {
         // Echo the command locally.
-        LogEntry *e = new LogEntry(LogEntry::Important, "", 0, ">",
+        LogEntry *e = new LogEntry(LogEntry::Note, "", 0, ">",
                                    LogEntry::Args() << new LogEntry::Arg(command));
         d->logBuffer.add(e);
 

diff --git a/doomsday/tools/shell/shell-text/src/shellapp.cpp b/doomsday/tools/shell/shell-text/src/shellapp.cpp
@@ -167,7 +167,7 @@ void ShellApp::openConnection(String const &address)
     LogBuffer::appBuffer().flush();
     d->log->clear();
 
-    LOG_INFO("Opening connection to %s") << address;
+    LOG_NET_NOTE("Opening connection to %s") << address;
 
     // Keep trying to connect to 30 seconds.
     d->link = new Link(address, 30);
@@ -186,7 +186,7 @@ void ShellApp::closeConnection()
 {
     if(d->link)
     {
-        LOG_INFO("Closing existing connection to %s") << d->link->address();
+        LOG_NET_NOTE("Closing existing connection to %s") << d->link->address();
 
         // Get rid of the old connection.
         disconnect(d->link, SIGNAL(packetsReady()), this, SLOT(handleIncomingPackets()));
@@ -277,7 +277,7 @@ void ShellApp::connectToFoundServer()
 {
     String label = d->menu->itemAction(d->menu->cursor()).label();
 
-    LOG_INFO("Selected: ") << label;
+    LOG_NOTE("Selected: ") << label;
 
     openConnection(label.left(label.indexOf('(') - 1));
 }
@@ -286,7 +286,7 @@ void ShellApp::sendCommandToServer(String command)
 {
     if(d->link)
     {
-        LOG_INFO(">") << command;
+        LOG_NOTE(">") << command;
 
         QScopedPointer<Packet> packet(d->link->protocol().newCommand(command));
         *d->link << *packet;