2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Renamed member variables.
	* src/LogFactory.cc
	* src/LogFactory.h
pull/1/head
Tatsuhiro Tsujikawa 2010-06-12 10:01:27 +00:00
parent 60995f1c5d
commit cc95c788b1
3 changed files with 18 additions and 12 deletions

View File

@ -1,3 +1,9 @@
2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Renamed member variables.
* src/LogFactory.cc
* src/LogFactory.h
2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Renamed member variables. Renamed member variables.

View File

@ -39,18 +39,18 @@
namespace aria2 { namespace aria2 {
std::string LogFactory::filename = DEV_NULL; std::string LogFactory::_filename = DEV_NULL;
Logger* LogFactory::logger = 0; Logger* LogFactory::_logger = 0;
bool LogFactory::_consoleOutput = true; bool LogFactory::_consoleOutput = true;
Logger::LEVEL LogFactory::_logLevel = Logger::A2_DEBUG; Logger::LEVEL LogFactory::_logLevel = Logger::A2_DEBUG;
Logger* LogFactory::getInstance() { Logger* LogFactory::getInstance() {
if(!logger) { if(!_logger) {
SimpleLogger* slogger = new SimpleLogger(); SimpleLogger* slogger = new SimpleLogger();
if(filename != DEV_NULL) { if(_filename != DEV_NULL) {
// don't open file DEV_NULL for performance sake. // don't open file DEV_NULL for performance sake.
// This avoids costly unecessary message formatting and write. // This avoids costly unecessary message formatting and write.
slogger->openFile(filename); slogger->openFile(_filename);
} }
slogger->setLogLevel(_logLevel); slogger->setLogLevel(_logLevel);
if(_consoleOutput) { if(_consoleOutput) {
@ -58,9 +58,9 @@ Logger* LogFactory::getInstance() {
slogger->setStdoutLogLevel(Logger::A2_WARN, true); slogger->setStdoutLogLevel(Logger::A2_WARN, true);
slogger->setStdoutLogLevel(Logger::A2_ERROR, true); slogger->setStdoutLogLevel(Logger::A2_ERROR, true);
} }
logger = slogger; _logger = slogger;
} }
return logger; return _logger;
} }
void LogFactory::setLogLevel(Logger::LEVEL level) void LogFactory::setLogLevel(Logger::LEVEL level)
@ -84,8 +84,8 @@ void LogFactory::setLogLevel(const std::string& level)
} }
void LogFactory::release() { void LogFactory::release() {
delete logger; delete _logger;
logger = 0; _logger = 0;
} }
} // namespace aria2 } // namespace aria2

View File

@ -45,8 +45,8 @@ namespace aria2 {
class LogFactory { class LogFactory {
private: private:
static std::string filename; static std::string _filename;
static Logger* logger; static Logger* _logger;
static bool _consoleOutput; static bool _consoleOutput;
static Logger::LEVEL _logLevel; static Logger::LEVEL _logLevel;
public: public:
@ -60,7 +60,7 @@ public:
* Set a filename to write log. * Set a filename to write log.
*/ */
static void setLogFile(const std::string& name) { static void setLogFile(const std::string& name) {
filename = name; _filename = name;
} }
/** /**