new optional feature: print logs to stdout with files.

.gitignore

@@ -27,3 +27,7 @@
 *.exe
 *.out
 *.app
+
+# build dir & files
+/build*/
+/CMakeLists.txt

CMakeLists4Windows.txt

@@ -86,6 +86,25 @@ else()
   message("(-DPOOLAGENT__USE_GLOG=ON switching to GLog)")
 endif()
 
+###
+# Print logs to stdout with files
+###
+option(POOLAGENT__GLOG_TO_STDOUT
+  "Print logs to stdout with files" OFF)
+
+if(POOLAGENT__GLOG_TO_STDOUT)
+  message("-- Print logs to stdout with files")
+  set(CompilerFlags CMAKE_CXX_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG
+                    CMAKE_CXX_FLAGS_RELEASE CMAKE_C_FLAGS_RELEASE)
+  foreach(CompilerFlag ${CompilerFlags})
+    set(${CompilerFlag} "${${CompilerFlag}} /DGLOG_TO_STDOUT")
+    message("${CompilerFlag}=${${CompilerFlag}}")
+  endforeach()
+else()
+  message("-- Only logs to file")
+  message("(-DPOOLAGENT__GLOG_TO_STDOUT=ON printing logs to stdout with files)")
+endif()
+
 
 SET(CMAKE_CXX_COMPILER_ARG1 "-std=c++98")
 SET(CMAKE_C_COMPILER_ARG1 "-std=c99")

README-Windows.md

@@ -73,6 +73,9 @@ POOLAGENT__USE_IOCP:BOOL=OFF
 
 # Use GLog for logging replace stdout
 POOLAGENT__USE_GLOG:BOOL=OFF
+
+# Print logs to stdout with files
+POOLAGENT__GLOG_TO_STDOUT:BOOL=OFF
 ```
 
 ## Static linking with VC++ runtime library

src/Utils.cc

@@ -21,7 +21,35 @@
 #include <stdarg.h>
 
 #include <algorithm>
+#include <iostream>
+#include <iomanip>
 
+#if defined(SUPPORT_GLOG) && defined(GLOG_TO_STDOUT)
+void GLogToStdout::send(google::LogSeverity severity, const char* full_filename,
+    const char* base_filename, int line, const struct ::tm* tm_time,
+    const char* message, size_t message_len) {
+
+    std::cout << ToString(severity, base_filename, line, tm_time, message, message_len) << std::endl;
+}
+
+std::string GLogToStdout::ToString(google::LogSeverity severity, const char* file, int line,
+    const struct ::tm* tm_time, const char* message, size_t message_len) {
+
+    std::ostringstream stream;
+
+    stream << '[' << 1900 + tm_time->tm_year << '-'
+        << std::setfill('0')
+        << std::setw(2) << 1 + tm_time->tm_mon << '-'
+        << std::setw(2) << tm_time->tm_mday << ' '
+        << std::setw(2) << tm_time->tm_hour << ':'
+        << std::setw(2) << tm_time->tm_min << ':'
+        << std::setw(2) << tm_time->tm_sec << "] ";
+
+    stream << string(message, message_len);
+
+    return stream.str();
+}
+#endif
 
 string Strings::Format(const char * fmt, ...) {
   char tmp[512];

src/Utils.h

@@ -68,6 +68,20 @@ using  std::vector;
 //
 #define BTCCOM_MINER_AGENT   "btccom-agent/0.1"
 
+#if defined(SUPPORT_GLOG) && defined(GLOG_TO_STDOUT)
+// Print logs to stdout with glog
+class GLogToStdout : public google::LogSink {
+public:
+    virtual void send(google::LogSeverity severity, const char* full_filename,
+        const char* base_filename, int line,
+        const struct ::tm* tm_time,
+        const char* message, size_t message_len);
+
+    virtual std::string ToString(google::LogSeverity severity, const char* file, int line,
+        const struct ::tm* tm_time,
+        const char* message, size_t message_len);
+};
+#endif
 
 class Strings {
 public:

src/agent/AgentMain.cc

@@ -20,6 +20,7 @@
 
 #include <fstream>
 #include <streambuf>
+#include "Utils.h"
 
 #include "Server.h"
 
@@ -81,6 +82,13 @@ int main(int argc, char **argv) {
   FLAGS_max_log_size = 10;  // max log file size 10 MB
   FLAGS_logbuflevel = -1;
   FLAGS_stop_logging_if_full_disk = true;
+
+ #if defined(GLOG_TO_STDOUT)
+  // Print logs to stdout with glog
+  GLogToStdout glogToStdout;
+  google::AddLogSink(&glogToStdout);
+ #endif
+
 #endif
 
   signal(SIGTERM, handler);