Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Build params changed, adjusted config_util to match current fc lib, witness main aligned to Bitshares as much as possible

Browse source
This commit is contained in:
Srdjan Obucina 2019-09-09 16:24:03 +02:00
parent 9d30da3259
commit d1ddbe5afb
3 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -135,7 +135,7 @@ else( WIN32 ) # Apple AND Linux
endif( APPLE ) endif( APPLE )
if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" ) if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin-memcmp -Wno-class-memaccess -Wno-parentheses -Wno-terminate -Wno-invalid-offsetof" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin-memcmp -Wno-parentheses -Wno-invalid-offsetof" )
elseif( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" ) elseif( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
if( CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0.0 ) if( CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0.0 )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-partial-specialization" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-partial-specialization" )

2
libraries/app/config_util.cpp
View file

@ -151,7 +151,7 @@ static fc::optional<fc::logging_config> load_logging_config_from_ini_file(const
fc::console_appender::level_color(fc::log_level::error, fc::console_appender::level_color(fc::log_level::error,
fc::console_appender::color::cyan)); fc::console_appender::color::cyan));
console_appender_config.stream = fc::variant(stream_name).as<fc::console_appender::stream::type>(GRAPHENE_MAX_NESTED_OBJECTS); console_appender_config.stream = fc::variant(stream_name).as<fc::console_appender::stream::type>(GRAPHENE_MAX_NESTED_OBJECTS);
logging_config.appenders.push_back(fc::appender_config(console_appender_name, "console", fc::variant(console_appender_config, GRAPHENE_MAX_NESTED_OBJECTS))); logging_config.appenders.push_back(fc::appender_config(console_appender_name, "console", fc::variant(console_appender_config)));
found_logging_config = true; found_logging_config = true;
} }
else if (boost::starts_with(section_name, file_appender_section_prefix)) else if (boost::starts_with(section_name, file_appender_section_prefix))

21
programs/witness_node/main.cpp
View file

@ -36,28 +36,18 @@
#include <graphene/utilities/git_revision.hpp> #include <graphene/utilities/git_revision.hpp>
//#include <graphene/snapshot/snapshot.hpp> //#include <graphene/snapshot/snapshot.hpp>
#include <fc/exception/exception.hpp>
#include <fc/thread/thread.hpp> #include <fc/thread/thread.hpp>
#include <fc/interprocess/signals.hpp> #include <fc/interprocess/signals.hpp>
#include <fc/log/console_appender.hpp>
#include <fc/log/file_appender.hpp>
#include <fc/log/logger.hpp>
#include <fc/log/logger_config.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/ini_parser.hpp> #include <boost/container/flat_set.hpp>
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
#include <graphene/utilities/git_revision.hpp> #include <graphene/utilities/git_revision.hpp>
#include <boost/version.hpp>
#include <boost/algorithm/string/replace.hpp> #include <boost/algorithm/string/replace.hpp>
#include <iostream> #include <iostream>
#include <fstream>
#ifdef WIN32 #ifdef WIN32
# include <signal.h> # include <signal.h>
@ -68,9 +58,6 @@
using namespace graphene; using namespace graphene;
namespace bpo = boost::program_options; namespace bpo = boost::program_options;
void write_default_logging_config_to_stream(std::ostream& out);
fc::optional<fc::logging_config> load_logging_config_from_ini_file(const fc::path& config_ini_filename);
int main(int argc, char** argv) { int main(int argc, char** argv) {
app::application* node = new app::application(); app::application* node = new app::application();
fc::oexception unhandled_exception; fc::oexception unhandled_exception;
@ -192,7 +179,7 @@ int main(int argc, char** argv) {
node->shutdown_plugins(); node->shutdown_plugins();
node->shutdown(); node->shutdown();
delete node; delete node;
return 0; return EXIT_SUCCESS;
} catch( const fc::exception& e ) { } catch( const fc::exception& e ) {
// deleting the node can yield, so do this outside the exception handler // deleting the node can yield, so do this outside the exception handler
unhandled_exception = e; unhandled_exception = e;
@ -203,7 +190,7 @@ int main(int argc, char** argv) {
elog("Exiting with error:\n${e}", ("e", unhandled_exception->to_detail_string())); elog("Exiting with error:\n${e}", ("e", unhandled_exception->to_detail_string()));
node->shutdown(); node->shutdown();
delete node; delete node;
return 1; return EXIT_FAILURE;
} }
} }