Changeset - fc3d81748eb3
[Not reviewed]
0 2 0
vitalyster - 10 years ago 2016-01-21 13:04:13
vitalyster@gmail.com
manager: install sample logging config
2 files changed with 5 insertions and 1 deletions:
0 comments (0 inline, 0 general)
spectrum/src/CMakeLists.txt
Show inline comments
 
@@ -28,25 +28,29 @@ endif()
 
INSTALL(TARGETS spectrum2 RUNTIME DESTINATION bin)
 

	
 
INSTALL(FILES
 
	sample2_gateway.cfg
 
	RENAME spectrum.cfg.example
 
	DESTINATION /etc/spectrum2/transports
 
	)
 

	
 
INSTALL(FILES
 
	sample2.cfg
 
	RENAME spectrum_server_mode.cfg.example
 
	DESTINATION /etc/spectrum2/transports
 
	)
 

	
 
INSTALL(FILES
 
	backend-logging.cfg
 
	DESTINATION /etc/spectrum2
 
	)
 

	
 
INSTALL(FILES
 
	logging.cfg
 
	DESTINATION /etc/spectrum2
 
	)
 

	
 
INSTALL(FILES
 
	manager-logging.cfg
 
	DESTINATION /etc/spectrum2
 
	)
 

	
spectrum_manager/src/managerconfig.cpp
Show inline comments
 
@@ -21,41 +21,41 @@
 
#include "managerconfig.h"
 
#include <fstream>
 

	
 
using namespace boost::program_options;
 

	
 
bool ManagerConfig::load(const std::string &configfile, boost::program_options::options_description &opts) {
 
	std::ifstream ifs(configfile.c_str());
 
	if (!ifs.is_open())
 
		return false;
 

	
 
	opts.add_options()
 
		("service.admin_username", value<std::string>()->default_value(""), "Administrator username.")
 
		("service.admin_password", value<std::string>()->default_value(""), "Administrator password.")
 
		("service.port", value<int>()->default_value(8081), "Web interface port.")
 
		("service.config_directory", value<std::string>()->default_value("/etc/spectrum2/transports/"), "Directory with spectrum2 configuration files. One .cfg file per one instance")
 
		("service.data_dir", value<std::string>()->default_value("/var/lib/spectrum2_manager/html"), "Directory to store Spectrum 2 manager data")
 
		("servers.server", value<std::vector<std::string> >()->multitoken(), "Server.")
 
		("database.type", value<std::string>()->default_value("none"), "Database type.")
 
		("database.database", value<std::string>()->default_value("/var/lib/spectrum2/$jid/database.sql"), "Database used to store data")
 
		("database.server", value<std::string>()->default_value("localhost"), "Database server.")
 
		("database.user", value<std::string>()->default_value(""), "Database user.")
 
		("database.password", value<std::string>()->default_value(""), "Database Password.")
 
		("database.port", value<int>()->default_value(0), "Database port.")
 
		("database.prefix", value<std::string>()->default_value(""), "Prefix of tables in database")
 
		("logging.config", value<std::string>()->default_value("/etc/spectrum2/logging.cfg"), "Logging configuration file")
 
		("logging.config", value<std::string>()->default_value("/etc/spectrum2/manager_logging.cfg"), "Logging configuration file")
 
	;
 

	
 
	store(parse_config_file(ifs, opts), m_variables);
 
	notify(m_variables);
 

	
 
	m_file = configfile;
 

	
 
	onManagerConfigReloaded();
 

	
 
	return true;
 
}
 

	
 
bool ManagerConfig::load(const std::string &configfile) {
 
	options_description opts("Transport options");
 
	return load(configfile, opts);
 
}
0 comments (0 inline, 0 general)