Merge pull request #83 from bitshares/log-obj-depth

Initialize max_object_depth in appender config
bitshares · Oct 19, 2018 · a1d84f2 · a1d84f2
2 parents 1935649 + 9f43902
commit a1d84f2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/include/fc/log/file_appender.hpp b/include/fc/log/file_appender.hpp
@@ -18,7 +18,7 @@ class file_appender : public appender {
             bool                               rotate = false;
             microseconds                       rotation_interval;
             microseconds                       rotation_limit;
-            uint32_t                           max_object_depth;
+            uint32_t                           max_object_depth = FC_MAX_LOG_OBJECT_DEPTH;
          };
          file_appender( const variant& args );
          ~file_appender();

diff --git a/include/fc/log/gelf_appender.hpp b/include/fc/log/gelf_appender.hpp
@@ -15,7 +15,7 @@ namespace fc
     {
       string endpoint = "127.0.0.1:12201";
       string host = "fc"; // the name of the host, source or application that sent this message (just passed through to GELF server)
-      uint32_t max_object_depth;
+      uint32_t max_object_depth = FC_MAX_LOG_OBJECT_DEPTH;
     };
 
     gelf_appender(const variant& args);

diff --git a/src/log/file_appender.cpp b/src/log/file_appender.cpp
@@ -144,9 +144,7 @@ namespace fc {
 
    file_appender::file_appender( const variant& args ) :
      my( new impl( args.as<config>( FC_MAX_LOG_OBJECT_DEPTH ) ) )
-   {
-
-   }
+   {}
 
    file_appender::~file_appender(){}
-Original file line number
+Diff line change
@@ Expand Up / @@ -144,9 +144,7 @@ namespace fc { @@
        file_appender::file_appender( const variant& args ) :
          my( new impl( args.as<config>( FC_MAX_LOG_OBJECT_DEPTH ) ) )
-       {
-       }
+       {}
        file_appender::~file_appender(){}
@@ Expand Down @@