From 6669f3e631f42250e23da22ad743fab8e3b3f540 Mon Sep 17 00:00:00 2001 From: Vlad Dobromyslov Date: Thu, 3 Mar 2022 02:16:54 +0300 Subject: [PATCH 1/8] #285 set FC_MAX_LOG_OBJECT_DEPTH to 1000 --- include/fc/config.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/fc/config.hpp b/include/fc/config.hpp index d08eaf1..08aa31a 100644 --- a/include/fc/config.hpp +++ b/include/fc/config.hpp @@ -5,5 +5,5 @@ #ifndef FC_MAX_LOG_OBJECT_DEPTH // how many levels of nested objects are displayed in log messages - #define FC_MAX_LOG_OBJECT_DEPTH 200 + #define FC_MAX_LOG_OBJECT_DEPTH 1000 #endif \ No newline at end of file -- 2.45.2 From ddf85dcb2aa405d4d08ffd04ec922ee6ca891115 Mon Sep 17 00:00:00 2001 From: Vlad Dobromyslov Date: Thu, 3 Mar 2022 02:17:34 +0300 Subject: [PATCH 2/8] #285 set FC_MAX_STRING_OBJECT_DEPTH default value in config file --- include/fc/config.hpp | 5 +++++ include/fc/string.hpp | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/fc/config.hpp b/include/fc/config.hpp index 08aa31a..8e64a1d 100644 --- a/include/fc/config.hpp +++ b/include/fc/config.hpp @@ -3,6 +3,11 @@ #define FC_PACK_MAX_DEPTH 1000 #endif +#ifndef FC_MAX_STRING_OBJECT_DEPTH + // how many levels of nested objects are proceed for string functions +#define FC_MAX_STRING_OBJECT_DEPTH 200 +#endif + #ifndef FC_MAX_LOG_OBJECT_DEPTH // how many levels of nested objects are displayed in log messages #define FC_MAX_LOG_OBJECT_DEPTH 1000 diff --git a/include/fc/string.hpp b/include/fc/string.hpp index 13e10da..2fce7b0 100755 --- a/include/fc/string.hpp +++ b/include/fc/string.hpp @@ -2,6 +2,7 @@ #include #include #include +#include #ifndef USE_FC_STRING #include @@ -25,7 +26,7 @@ namespace fc typedef fc::optional ostring; class variant_object; - fc::string format_string( const fc::string&, const variant_object&, uint32_t max_object_depth = 200 ); + fc::string format_string( const fc::string&, const variant_object&, uint32_t max_object_depth = FC_MAX_STRING_OBJECT_DEPTH ); fc::string trim( const fc::string& ); fc::string to_lower( const fc::string& ); string trim_and_normalize_spaces( const string& s ); -- 2.45.2 From ba9952aa28b008569a3468d37f3e5fcb2835c1b5 Mon Sep 17 00:00:00 2001 From: Vlad Dobromyslov Date: Thu, 3 Mar 2022 02:18:03 +0300 Subject: [PATCH 3/8] #285 initialize max_object_depth in constructor --- include/fc/log/gelf_appender.hpp | 2 +- src/log/file_appender.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/fc/log/gelf_appender.hpp b/include/fc/log/gelf_appender.hpp index ba81c3d..1df2b2a 100755 --- 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 index f499ed4..1840c34 100755 --- a/src/log/file_appender.cpp +++ b/src/log/file_appender.cpp @@ -168,7 +168,8 @@ namespace fc { filename(p), flush(true), rotate(false), - rotation_compression(false) + rotation_compression(false), + max_object_depth(FC_MAX_LOG_OBJECT_DEPTH) {} file_appender::file_appender( const variant& args ) : -- 2.45.2 From 465c693370dbd43966e2b4f1b49e820e64f40f75 Mon Sep 17 00:00:00 2001 From: Vlad Dobromyslov Date: Thu, 3 Mar 2022 02:18:18 +0300 Subject: [PATCH 4/8] #285 New size for biggie object --- tests/io/json_tests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/io/json_tests.cpp b/tests/io/json_tests.cpp index e06f51b..3bc16d8 100644 --- a/tests/io/json_tests.cpp +++ b/tests/io/json_tests.cpp @@ -335,7 +335,7 @@ BOOST_AUTO_TEST_CASE(recursion_test) BOOST_AUTO_TEST_CASE(rethrow_test) { fc::variants biggie; - for( int i = 0; i < 250; i++ ) + for( int i = 0; i < 1010; i++ ) { fc::variant tmp( std::move(biggie) ); biggie.reserve(1); -- 2.45.2 From 7b2fdc886dba1591bff340149505ad1da2a57da0 Mon Sep 17 00:00:00 2001 From: serkixenos Date: Thu, 3 Mar 2022 01:41:10 +0000 Subject: [PATCH 5/8] CI/CD improvements --- .gitlab-ci.yml | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccc5446..30bbbd1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,9 +2,43 @@ include: - template: Jobs/Code-Quality.gitlab-ci.yml stages: + - build - test + - trigger + +build: + stage: build + script: + - rm -rf .git/modules/vendor + - git submodule sync + - git submodule update --init --recursive + - rm -rf build + - mkdir build + - cd build + - cmake -DCMAKE_BUILD_TYPE=Release .. + - make -j$(nproc) + artifacts: + untracked: true + paths: + - build/tests/ + tags: + - builder-fc + +test: + stage: test + dependencies: + - build + script: + - ./build/tests/all_test + tags: + - builder-fc + when: + - manual trigger_build_peerplays: - stage: test + stage: trigger + dependencies: + - test script: - "curl -X POST -F token=$CI_JOB_TOKEN -F ref=$REF_NAME https://gitlab.com/api/v4/projects/10735589/trigger/pipeline" + \ No newline at end of file -- 2.45.2 From 9bc8d73c8e821abbb726f3c3c88503db110035b0 Mon Sep 17 00:00:00 2001 From: serkixenos Date: Thu, 3 Mar 2022 02:10:28 +0000 Subject: [PATCH 6/8] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30bbbd1..c9dd7b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ stages: build: stage: build script: - - rm -rf .git/modules/vendor + - rm -rf .git/modules/vendor ./vendor - git submodule sync - git submodule update --init --recursive - rm -rf build -- 2.45.2 From f815ab5dce58f3072bb6e18e4677a7915425779d Mon Sep 17 00:00:00 2001 From: serkixenos Date: Fri, 4 Mar 2022 22:13:57 +0000 Subject: [PATCH 7/8] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9dd7b3..fa2f4aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ include: stages: - build - test - - trigger + - trigger_build_peerplays build: stage: build -- 2.45.2 From abb3016ca9e067c016fb92c8bb83f1585eb497e9 Mon Sep 17 00:00:00 2001 From: serkixenos Date: Fri, 4 Mar 2022 22:14:48 +0000 Subject: [PATCH 8/8] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa2f4aa..311ebcd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ test: - manual trigger_build_peerplays: - stage: trigger + stage: trigger_build_peerplays dependencies: - test script: -- 2.45.2