From 5399b93270ea4d4c76c2d62efbb4ed0306ac9873 Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Thu, 11 Apr 2019 11:36:20 -0400
Subject: [PATCH] make format and readd win32 console color logging

---
 libabyss/src/http.cpp       |  3 ++-
 llarp/crypto/types.hpp      |  4 ++--
 llarp/rpc/rpc.cpp           | 14 ++++++++------
 llarp/service/config.cpp    |  3 ++-
 llarp/util/threadpool.h     |  4 ++--
 llarp/util/win32_logger.cpp | 24 +++++++++++++++++++++---
 6 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/libabyss/src/http.cpp b/libabyss/src/http.cpp
index c6f066006..7a1f20cfb 100644
--- a/libabyss/src/http.cpp
+++ b/libabyss/src/http.cpp
@@ -28,7 +28,8 @@ namespace abyss
       if(ShouldProcessHeader(string_view(lowerHeader)))
       {
         val = val.substr(val.find_first_not_of(' '));
-        Header.Headers.emplace(lowerHeader.c_str(), llarp::string_view_string(val));
+        Header.Headers.emplace(lowerHeader.c_str(),
+                               llarp::string_view_string(val));
       }
       return true;
     }
diff --git a/llarp/crypto/types.hpp b/llarp/crypto/types.hpp
index 8bd298662..4933d9210 100644
--- a/llarp/crypto/types.hpp
+++ b/llarp/crypto/types.hpp
@@ -91,7 +91,7 @@ namespace llarp
     friend std::ostream &
     operator<<(std::ostream &out, const SecretKey &)
     {
-      //return out << k.ToHex();
+      // return out << k.ToHex();
       // make sure we never print out secret keys
       return out << "[secretkey]";
     }
@@ -132,7 +132,7 @@ namespace llarp
     friend std::ostream &
     operator<<(std::ostream &out, const IdentitySecret &)
     {
-      //return out << k.ToHex();
+      // return out << k.ToHex();
       // make sure we never print out secret keys
       return out << "[secretkey]";
     }
diff --git a/llarp/rpc/rpc.cpp b/llarp/rpc/rpc.cpp
index afe85d956..36749b5aa 100644
--- a/llarp/rpc/rpc.cpp
+++ b/llarp/rpc/rpc.cpp
@@ -232,12 +232,14 @@ namespace llarp
       ListNeighboors() const
       {
         Response resp = Response::array();
-        router->ForEachPeer([&](const ILinkSession* session, bool outbound) {
-          resp.emplace_back(
-              Response{{"ident", RouterID(session->GetPubKey()).ToString()},
-                       {"addr", session->GetRemoteEndpoint().ToString()},
-                       {"outbound", outbound}});
-        }, false);
+        router->ForEachPeer(
+            [&](const ILinkSession* session, bool outbound) {
+              resp.emplace_back(
+                  Response{{"ident", RouterID(session->GetPubKey()).ToString()},
+                           {"addr", session->GetRemoteEndpoint().ToString()},
+                           {"outbound", outbound}});
+            },
+            false);
         return resp;
       }
 
diff --git a/llarp/service/config.cpp b/llarp/service/config.cpp
index a6d8d1fe5..e8f39db26 100644
--- a/llarp/service/config.cpp
+++ b/llarp/service/config.cpp
@@ -17,7 +17,8 @@ namespace llarp
         llarp::service::Config::section_t values;
         values.first.assign(name.begin(), name.end());
         for(const auto& item : section)
-          values.second.emplace_back(string_view_string(item.first), string_view_string(item.second));
+          values.second.emplace_back(string_view_string(item.first),
+                                     string_view_string(item.second));
         services.emplace_back(values);
       });
       return services.size() > 0;
diff --git a/llarp/util/threadpool.h b/llarp/util/threadpool.h
index b425890ee..463ef0994 100644
--- a/llarp/util/threadpool.h
+++ b/llarp/util/threadpool.h
@@ -16,8 +16,8 @@ struct llarp_threadpool
   std::queue< std::function< void(void) > > jobs GUARDED_BY(m_access);
 
   llarp_threadpool(int workers, const char *name)
-      : impl(
-          std::make_unique< llarp::thread::ThreadPool >(workers, workers * 128))
+      : impl(std::make_unique< llarp::thread::ThreadPool >(workers,
+                                                           workers * 128))
   {
     (void)name;
   }
diff --git a/llarp/util/win32_logger.cpp b/llarp/util/win32_logger.cpp
index a2603a924..0cc792488 100644
--- a/llarp/util/win32_logger.cpp
+++ b/llarp/util/win32_logger.cpp
@@ -26,20 +26,34 @@ namespace llarp
   {
     if(!isConsoleModern)
     {
+      GetConsoleScreenBufferInfo(fd1, &consoleInfo);
+      old_attrs = consoleInfo.wAttributes;
       switch(lvl)
       {
         case eLogNone:
           break;
         case eLogDebug:
+          SetConsoleTextAttribute(fd1,
+                                  FOREGROUND_RED | FOREGROUND_GREEN
+                                      | FOREGROUND_BLUE);  // low white on black
           ss << "[DBG] ";
           break;
         case eLogInfo:
+          SetConsoleTextAttribute(
+              fd1,
+              FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN
+                  | FOREGROUND_BLUE);  // high white on black
           ss << "[NFO] ";
           break;
         case eLogWarn:
+          SetConsoleTextAttribute(fd1,
+                                  FOREGROUND_RED | FOREGROUND_GREEN
+                                      | FOREGROUND_INTENSITY);  // bright yellow
           ss << "[WRN] ";
           break;
         case eLogError:
+          SetConsoleTextAttribute(
+              fd1, FOREGROUND_RED | FOREGROUND_INTENSITY);  // bright red
           ss << "[ERR] ";
           break;
       }
@@ -53,10 +67,14 @@ namespace llarp
   void
   Win32LogStream::PostLog(std::stringstream& ss) const
   {
-    if(isConsoleModern)
-      OStreamLogStream::PostLog(ss);
-    else
+    if(!isConsoleModern)
+    {
+      SetConsoleTextAttribute(
+          fd1, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
       ss << std::endl;
+    }
+    else
+      OStreamLogStream::PostLog(ss);
   }
 }  // namespace llarp
 #endif