Straighten out existing log categories

Author: jamescowens

src/addrman.cpp

@@ -302,7 +302,7 @@ void CAddrMan::Good_(const CService &addr, int64_t nTime)
     // TODO: maybe re-add the node, but for now, just bail out
     if (nUBucket == -1) return;
 
-    if (fDebug10) LogPrint("addr", "Moving %s to tried", addr.ToString());
+    LogPrint("addrman", "Moving %s to tried", addr.ToString());
 
     // move nId to the tried tables
     MakeTried(info, nId, nUBucket);

src/addrman.h

@@ -403,7 +403,7 @@ class CAddrMan
             LOCK(cs);
             int err;
             if ((err=Check_()))
-                LogPrint("addr", "ADDRMAN CONSISTENCY CHECK FAILED!!! err=%i", err);
+                LogPrint("addrman", "ADDRMAN CONSISTENCY CHECK FAILED!!! err=%i", err);
         }
 #endif
     }
@@ -419,7 +419,7 @@ class CAddrMan
             Check();
         }
         if (fRet)
-            LogPrint("addr","Added %s from %s: %i tried, %i new", addr.ToStringIPPort(), source.ToString(), nTried, nNew);
+            LogPrint("addrman","Added %s from %s: %i tried, %i new", addr.ToStringIPPort(), source.ToString(), nTried, nNew);
         return fRet;
     }
 
@@ -435,7 +435,7 @@ class CAddrMan
             Check();
         }
         if (nAdd)
-            if (fDebug) LogPrint("addr","Added %i addresses from %s: %i tried, %i new", nAdd, source.ToString(), nTried, nNew);
+            LogPrint("addrman","Added %i addresses from %s: %i tried, %i new", nAdd, source.ToString(), nTried, nNew);
         return nAdd > 0;
     }
 

src/banman.cpp

@@ -208,7 +208,7 @@ void BanMan::SweepBanned()
 
                 m_is_dirty = true;
                 notify_ui = true;
-                LogPrint("network", "%s: Removed banned node ip/subnet from banlist.dat: %s\n", __func__, sub_net.ToString());
+                LogPrint("net", "%s: Removed banned node ip/subnet from banlist.dat: %s\n", __func__, sub_net.ToString());
             } else
                 ++it;
         }

src/logging.cpp

@@ -178,6 +178,7 @@ const CLogCategoryDesc LogCategories[] =
     {BCLog::SCRAPER, "scraper"},
     {BCLog::MANIFEST, "manifest"},
     {BCLog::SB, "superblock"},
+    {BCLog::ALERT, "alert"},
     {BCLog::ALL, "1"},
     {BCLog::ALL, "all"},
 };

src/logging.h

@@ -79,6 +79,7 @@ namespace BCLog {
         SCRAPER     = (1 << 21),
         MANIFEST    = (1 << 22),
         SB          = (1 << 23),
+        ALERT       = (1 << 24),
         ALL         = ~(uint32_t)0,
     };
 

src/qt/bitcoin.cpp

@@ -171,7 +171,7 @@ static std::string Translate(const char* psz)
 void DebugMessageHandler(QtMsgType type, const char *msg)
 {
     if (type == QtDebugMsg) {
-        LogPrint("Qt", "GUI: %s\n", msg);
+        LogPrint("qt", "GUI: %s\n", msg);
     } else {
         LogPrintf("GUI: %s\n", msg);
     }
@@ -181,7 +181,7 @@ void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, cons
 {
     Q_UNUSED(context);
     if (type == QtDebugMsg) {
-        LogPrint("Qt", "GUI: %s\n", msg.toStdString());
+        LogPrint("qt", "GUI: %s\n", msg.toStdString());
     } else {
         LogPrintf("GUI: %s\n", msg.toStdString());
     }

src/scraper_net.cpp

@@ -417,7 +417,7 @@ void CScraperManifest::UnserializeCheck(CDataStream& ss, unsigned int& banscore_
     uint256 hash = Hash(pbegin, ss.begin());
 
     ss >> signature;
-    LogPrint("Manifest", "CScraperManifest::UnserializeCheck: hash of signature = %s", Hash(signature.begin(), signature.end()).GetHex());
+    LogPrint("manifest", "CScraperManifest::UnserializeCheck: hash of signature = %s", Hash(signature.begin(), signature.end()).GetHex());
 
     CKey mkey;
     if(!mkey.SetPubKey(pubkey))