Allow to chose stdout/stderr for console appender (#162, #117)

SergiusTheBest · web-flow · commit 47883f060999 · 2020-06-01T13:14:35.000+03:00
* add stderr/stdcout choice
* add stderr handle
* use correct streams
* fix last handle
* don't use too modern c++
diff --git a/include/plog/Appenders/ColorConsoleAppender.h b/include/plog/Appenders/ColorConsoleAppender.h
@@ -9,18 +9,22 @@ namespace plog
     {
     public:
 #ifdef _WIN32
-        ColorConsoleAppender() : m_originalAttr()
+        ColorConsoleAppender(OutputStream outStream = streamStdOut) 
+            : ConsoleAppender<Formatter>(outStream)
+            , m_originalAttr()
         {
             if (this->m_isatty)
             {
                 CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
-                GetConsoleScreenBufferInfo(this->m_stdoutHandle, &csbiInfo);
+                GetConsoleScreenBufferInfo(this->m_outputHandle, &csbiInfo);
 
                 m_originalAttr = csbiInfo.wAttributes;
             }
         }
 #else
-        ColorConsoleAppender() {}
+        ColorConsoleAppender(OutputStream outStream = streamStdOut) 
+            : ConsoleAppender<Formatter>(outStream)
+        {}
 #endif
 
         virtual void write(const Record& record)
@@ -42,37 +46,37 @@ namespace plog
                 {
 #ifdef _WIN32
                 case fatal:
-                    SetConsoleTextAttribute(this->m_stdoutHandle, foreground::kRed | foreground::kGreen | foreground::kBlue | foreground::kIntensity | background::kRed); // white on red background
+                    SetConsoleTextAttribute(this->m_outputHandle, foreground::kRed | foreground::kGreen | foreground::kBlue | foreground::kIntensity | background::kRed); // white on red background
                     break;
 
                 case error:
-                    SetConsoleTextAttribute(this->m_stdoutHandle, static_cast<WORD>(foreground::kRed | foreground::kIntensity | (m_originalAttr & 0xf0))); // red
+                    SetConsoleTextAttribute(this->m_outputHandle, static_cast<WORD>(foreground::kRed | foreground::kIntensity | (m_originalAttr & 0xf0))); // red
                     break;
 
                 case warning:
-                    SetConsoleTextAttribute(this->m_stdoutHandle, static_cast<WORD>(foreground::kRed | foreground::kGreen | foreground::kIntensity | (m_originalAttr & 0xf0))); // yellow
+                    SetConsoleTextAttribute(this->m_outputHandle, static_cast<WORD>(foreground::kRed | foreground::kGreen | foreground::kIntensity | (m_originalAttr & 0xf0))); // yellow
                     break;
 
                 case debug:
                 case verbose:
-                    SetConsoleTextAttribute(this->m_stdoutHandle, static_cast<WORD>(foreground::kGreen | foreground::kBlue | foreground::kIntensity | (m_originalAttr & 0xf0))); // cyan
+                    SetConsoleTextAttribute(this->m_outputHandle, static_cast<WORD>(foreground::kGreen | foreground::kBlue | foreground::kIntensity | (m_originalAttr & 0xf0))); // cyan
                     break;
 #else
                 case fatal:
-                    std::cout << "\x1B[97m\x1B[41m"; // white on red background
+                    this->m_outputStream << "\x1B[97m\x1B[41m"; // white on red background
                     break;
 
                 case error:
-                    std::cout << "\x1B[91m"; // red
+                    this->m_outputStream << "\x1B[91m"; // red
                     break;
 
                 case warning:
-                    std::cout << "\x1B[93m"; // yellow
+                    this->m_outputStream << "\x1B[93m"; // yellow
                     break;
 
                 case debug:
                 case verbose:
-                    std::cout << "\x1B[96m"; // cyan
+                    this->m_outputStream << "\x1B[96m"; // cyan
                     break;
 #endif
                 default:
@@ -86,9 +90,9 @@ namespace plog
             if (this->m_isatty)
             {
 #ifdef _WIN32
-                SetConsoleTextAttribute(this->m_stdoutHandle, m_originalAttr);
+                SetConsoleTextAttribute(this->m_outputHandle, m_originalAttr);
 #else
-                std::cout << "\x1B[0m\x1B[0K";
+                this->m_outputStream << "\x1B[0m\x1B[0K";
 #endif
             }
         }
diff --git a/include/plog/Appenders/ConsoleAppender.h b/include/plog/Appenders/ConsoleAppender.h
@@ -6,20 +6,32 @@
 
 namespace plog
 {
+    enum OutputStream
+    {
+        streamStdOut,
+        streamStdErr
+    };
+
     template<class Formatter>
     class ConsoleAppender : public IAppender
     {
     public:
 #ifdef _WIN32
-        ConsoleAppender() : m_isatty(!!_isatty(_fileno(stdout))), m_stdoutHandle()
+        ConsoleAppender(OutputStream outStream = streamStdOut)
+            : m_isatty(!!_isatty(_fileno(outStream == streamStdOut ? stdout : stderr)))
+            , m_outputStream(outStream == streamStdOut ? std::cout : std::cerr)
+            , m_outputHandle()
         {
             if (m_isatty)
             {
-                m_stdoutHandle = GetStdHandle(stdHandle::kOutput);
+                m_outputHandle = GetStdHandle(outStream == streamStdOut ? stdHandle::kOutput : stdHandle::kErrorOutput);
             }
         }
 #else
-        ConsoleAppender() : m_isatty(!!isatty(fileno(stdout))) {}
+        ConsoleAppender(OutputStream outStream = streamStdOut) 
+            : m_isatty(!!isatty(fileno(outStream == streamStdOut ? stdout : stderr))) 
+            , m_outputStream(outStream == streamStdOut ? std::cout : std::cerr)
+        {}
 #endif
 
         virtual void write(const Record& record)
@@ -36,14 +48,14 @@ namespace plog
 #ifdef _WIN32
             if (m_isatty)
             {
-                WriteConsoleW(m_stdoutHandle, str.c_str(), static_cast<DWORD>(str.size()), NULL, NULL);
+                WriteConsoleW(m_outputHandle, str.c_str(), static_cast<DWORD>(str.size()), NULL, NULL);
             }
             else
             {
-                std::cout << util::toNarrow(str, codePage::kActive) << std::flush;
+                m_outputStream << util::toNarrow(str, codePage::kActive) << std::flush;
             }
 #else
-            std::cout << str << std::flush;
+            m_outputStream << str << std::flush;
 #endif
         }
 
@@ -55,8 +67,9 @@ namespace plog
     protected:
         util::Mutex m_mutex;
         const bool  m_isatty;
+        std::ostream& m_outputStream;
 #ifdef _WIN32
-        HANDLE      m_stdoutHandle;
+        HANDLE      m_outputHandle;
 #endif
     };
 }
diff --git a/include/plog/WinApi.h b/include/plog/WinApi.h
@@ -87,9 +87,10 @@ namespace plog
         const DWORD kDword = 4;
     }
 
-    namespace stdHandle
+     namespace stdHandle
     {
         const DWORD kOutput = static_cast<DWORD>(-11);
+        const DWORD kErrorOutput = static_cast<DWORD>(-12);
     }
 
     namespace foreground

Original file line number	Diff line number	Diff line change
`@@ -6,20 +6,32 @@`
`6`	`6`
`7`	`7`	`namespace plog`
`8`	`8`	`{`
	`9`	`+ enum OutputStream`
	`10`	`+ {`
	`11`	`+ streamStdOut,`
	`12`	`+ streamStdErr`
	`13`	`+ };`
	`14`	`+`
`9`	`15`	`template<class Formatter>`
`10`	`16`	`class ConsoleAppender : public IAppender`
`11`	`17`	`{`
`12`	`18`	`public:`
`13`	`19`	`#ifdef _WIN32`
`14`		`- ConsoleAppender() : m_isatty(!!_isatty(_fileno(stdout))), m_stdoutHandle()`
	`20`	`+ ConsoleAppender(OutputStream outStream = streamStdOut)`
	`21`	`+ : m_isatty(!!_isatty(_fileno(outStream == streamStdOut ? stdout : stderr)))`
	`22`	`+ , m_outputStream(outStream == streamStdOut ? std::cout : std::cerr)`
	`23`	`+ , m_outputHandle()`
`15`	`24`	`{`
`16`	`25`	`if (m_isatty)`
`17`	`26`	`{`
`18`		`- m_stdoutHandle = GetStdHandle(stdHandle::kOutput);`
	`27`	`+ m_outputHandle = GetStdHandle(outStream == streamStdOut ? stdHandle::kOutput : stdHandle::kErrorOutput);`
`19`	`28`	`}`
`20`	`29`	`}`
`21`	`30`	`#else`
`22`		`- ConsoleAppender() : m_isatty(!!isatty(fileno(stdout))) {}`
	`31`	`+ ConsoleAppender(OutputStream outStream = streamStdOut)`
	`32`	`+ : m_isatty(!!isatty(fileno(outStream == streamStdOut ? stdout : stderr)))`
	`33`	`+ , m_outputStream(outStream == streamStdOut ? std::cout : std::cerr)`
	`34`	`+ {}`
`23`	`35`	`#endif`
`24`	`36`
`25`	`37`	`virtual void write(const Record& record)`
`@@ -36,14 +48,14 @@ namespace plog`
`36`	`48`	`#ifdef _WIN32`
`37`	`49`	`if (m_isatty)`
`38`	`50`	`{`
`39`		`- WriteConsoleW(m_stdoutHandle, str.c_str(), static_cast<DWORD>(str.size()), NULL, NULL);`
	`51`	`+ WriteConsoleW(m_outputHandle, str.c_str(), static_cast<DWORD>(str.size()), NULL, NULL);`
`40`	`52`	`}`
`41`	`53`	`else`
`42`	`54`	`{`
`43`		`- std::cout << util::toNarrow(str, codePage::kActive) << std::flush;`
	`55`	`+ m_outputStream << util::toNarrow(str, codePage::kActive) << std::flush;`
`44`	`56`	`}`
`45`	`57`	`#else`
`46`		`- std::cout << str << std::flush;`
	`58`	`+ m_outputStream << str << std::flush;`
`47`	`59`	`#endif`
`48`	`60`	`}`
`49`	`61`
`@@ -55,8 +67,9 @@ namespace plog`
`55`	`67`	`protected:`
`56`	`68`	`util::Mutex m_mutex;`
`57`	`69`	`const bool m_isatty;`
	`70`	`+ std::ostream& m_outputStream;`
`58`	`71`	`#ifdef _WIN32`
`59`		`- HANDLE m_stdoutHandle;`
	`72`	`+ HANDLE m_outputHandle;`
`60`	`73`	`#endif`
`61`	`74`	`};`
`62`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,10 @@ namespace plog`
`87`	`87`	`const DWORD kDword = 4;`
`88`	`88`	`}`
`89`	`89`
`90`		`- namespace stdHandle`
	`90`	`+ namespace stdHandle`
`91`	`91`	`{`
`92`	`92`	`const DWORD kOutput = static_cast<DWORD>(-11);`
	`93`	`+ const DWORD kErrorOutput = static_cast<DWORD>(-12);`
`93`	`94`	`}`
`94`	`95`
`95`	`96`	`namespace foreground`