libtransport.git Changeset - d45bd16104aa

Changeset - d45bd16104aa

Parent rev.

Child rev.

[Not reviewed]

Merge

3 24 14

Jan Kaluza - 10 years ago 2016-01-21 17:07:45
hanzz.k@gmail.com

Merge pull request #100 from vitalyster/manager_logging

Manager logging

7 files changed with 22 insertions and 0 deletions:

include/transport/Logging.h

libtransport/Logging.cpp

spectrum/src/CMakeLists.txt

spectrum/src/manager-logging.cfg

spectrum_manager/src/managerconfig.cpp

spectrum_manager/src/server.cpp

spectrum_manager/src/server.h

0 comments (0 inline, 0 general)

include/transport/Logging.h

➞

Show inline comments

@@ @@ -53,12 +53,13 @@ namespace Transport { @@
 class Config;
 namespace Logging {
 void initBackendLogging(Config *config);
 void initMainLogging(Config *config);
 void initManagerLogging(Config *config);
 void shutdownLogging();
 void redirect_stderr();
+}
+}

libtransport/Logging.cpp

➞

Show inline comments

@@ @@ -200,12 +200,15 @@ void initBackendLogging(Config *config) { @@
+}
 void initMainLogging(Config *config) {
 	initLogging(config, "logging.config");
 	initLogging(config, "logging.backend_config", true);
+}
 void initManagerLogging(Config *config) {
         initLogging(config, "logging.config");
+}
 void redirect_stderr() {
 	 intercepter_cerr = new intercept_stream(std::cerr, "cerr");
 	 intercepter_cout = new intercept_stream(std::cout, "cout");
+}

spectrum/src/CMakeLists.txt

➞

Show inline comments

@@ @@ -46,7 +46,11 @@ INSTALL(FILES @@
 INSTALL(FILES
 	logging.cfg
 	DESTINATION /etc/spectrum2
+	)
 INSTALL(FILES
 	manager-logging.cfg
 	DESTINATION /etc/spectrum2
+	)

spectrum/src/manager-logging.cfg

➞

Show inline comments

@@ new file 100644 @@
 log4j.rootLogger=debug, R
 log4j.appender.R=org.apache.log4j.RollingFileAppender
 log4j.appender.R.File=/var/log/spectrum2/spectrum_manager.log
 log4j.appender.R.MaxFileSize=10000KB
 # Keep one backup file
 log4j.appender.R.MaxBackupIndex=1
 log4j.appender.R.layout=org.apache.log4j.PatternLayout
 log4j.appender.R.layout.ConversionPattern=%d %-5p %c: %m%n

spectrum_manager/src/managerconfig.cpp

➞

Show inline comments

 		("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/manager_logging.cfg"), "Logging configuration file")
+	;
 	store(parse_config_file(ifs, opts), m_variables);
 	notify(m_variables);
 	m_file = configfile;

spectrum_manager/src/server.cpp

➞

Show inline comments

 		footer.close();
+	}
 	m_storageCfg = new Config();
 	m_storageCfg->load(config_file);
 	Logging::initManagerLogging(m_storageCfg);
 	std::string error;
 	m_storage = StorageBackend::createBackend(m_storageCfg, error);
 	if (m_storage == NULL) {
 		std::cerr << "Error creating StorageBackend! " << error << "\n";
 		std::cerr << "Registering new Spectrum 2 manager users won't work" << "\n";
+	}

spectrum_manager/src/server.h

➞

Show inline comments

@@ @@ -29,12 +29,13 @@ @@
 #include <boost/signal.hpp>
 #include "mongoose.h"
 #include "managerconfig.h"
 #include "transport/Config.h"
 #include "transport/Logging.h"
 #include "transport/SQLite3Backend.h"
 #include "transport/MySQLBackend.h"
 #include "transport/PQXXBackend.h"
 #include "transport/StorageBackend.h"
 using namespace Transport;

0 comments (0 inline, 0 general)