Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert commit b7ae96f as the bitshares/bitshares-ui#1338 is complete #1049

Merged
merged 7 commits into from
Sep 3, 2018
Merged

Revert commit b7ae96f as the bitshares/bitshares-ui#1338 is complete #1049

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d370b3f
Revert commit b7ae96f as the bitshares/bitshares-ui#1338 is complete
jmjatlanta Jun 13, 2018
e02ad1f
Fix merge conflict
jmjatlanta Aug 23, 2018
bab3348
enable subscribe_to_all by default
jmjatlanta Aug 24, 2018
7b02d9a
Make default cl param not take boolean
jmjatlanta Sep 1, 2018
1c3cc77
Remove test code
jmjatlanta Sep 1, 2018
5f34955
Fixed logic error on eval of param
jmjatlanta Sep 1, 2018
f7d3747
Add white space to keep you-know-who happy
jmjatlanta Sep 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions libraries/app/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,8 @@ void application_impl::startup()
_force_validate = true;
}

// TODO uncomment this when GUI is ready
//if( _options->count("enable-subscribe-to-all") )
// _app_options.enable_subscribe_to_all = _options->at("enable-subscribe-to-all").as<bool>();
if( _options->count("enable-subscribe-to-all") )
_app_options.enable_subscribe_to_all = _options->at("enable-subscribe-to-all").as<bool>();

if( _active_plugins.find( "market_history" ) != _active_plugins.end() )
_app_options.has_market_history_plugin = true;
Expand Down Expand Up @@ -943,12 +942,11 @@ void application::set_program_options(boost::program_options::options_descriptio
("api-access", bpo::value<boost::filesystem::path>(), "JSON file specifying API permissions")
("plugins", bpo::value<string>(), "Space-separated list of plugins to activate")
("io-threads", bpo::value<uint16_t>()->implicit_value(0), "Number of IO threads, default to 0 for auto-configuration")
("enable-subscribe-to-all", bpo::value<bool>()->implicit_value(true),
"Whether allow API clients to subscribe to universal object creation and removal events")
("enable-standby-votes-tracking", bpo::value<bool>()->implicit_value(true),
"Whether to enable tracking of votes of standby witnesses and committee members. "
"Set it to true to provide accurate data to API clients, set to false for slightly better performance.")
// TODO uncomment this when GUI is ready
//("enable-subscribe-to-all", bpo::value<bool>()->implicit_value(false),
// "Whether allow API clients to subscribe to universal object creation and removal events")
;
command_line_options.add(configuration_file_options);
command_line_options.add_options()
Expand Down
1 change: 0 additions & 1 deletion libraries/app/include/graphene/app/application.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ namespace graphene { namespace app {
class application_options
{
public:
// TODO change default to false when GUI is ready
bool enable_subscribe_to_all = true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't change this one to true.

Sorry, my above comment was not clear enough. Expected behavior:

  • this option is disabled by default (if not specified in config.ini nor startup parameters);
  • if a user specified it in parameters or config.ini, if without =X (only --enable-subscribe-to-all but not --enable-subscribe-to-all=true), consider the value is true.

bool has_market_history_plugin = false;
};
Expand Down