Changeset c3f8c4


Ignore:
Timestamp:
Mar 11, 2010, 2:19:53 PM (15 years ago)
Author:
Tillmann Crueger <crueger@…>
Children:
e9f2e1
Parents:
8a4f12
Message:

Made logger class use the new Singleton framework

Location:
molecuilder/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • molecuilder/src/Makefile.am

    r8a4f12 rc3f8c4  
    1212
    1313PATTERNSOURCE = Patterns/Observer.cpp
    14 PATTERNHEADER = Patterns/Observer.hpp Patterns/Cacheable.hpp
     14PATTERNHEADER = Patterns/Cacheable.hpp \
     15                                Patterns/Observer.hpp \
     16                Patterns/Singleton.hpp
    1517
    1618VIEWSOURCE = Views/View.cpp Views/StringView.cpp Views/MethodStringView.cpp Views/StreamStringView.cpp

  • molecuilder/src/log.cpp

    r8a4f12 rc3f8c4  
    1515 */
    1616void setVerbosity(int verbosityLevel) {
    17   logger::getInstance()->setVerbosity(verbosityLevel);
     17  logger::getInstance().setVerbosity(verbosityLevel);
    1818  errorLogger::getInstance()->setVerbosity(verbosityLevel);
    1919}
    … …  
    2424 * \param indentation level of the message to log
    2525 */
    26 class logger * Log() {
     26class logger& Log() {
    2727  return logger::getInstance();
    2828}

  • molecuilder/src/logger.cpp

    r8a4f12 rc3f8c4  
    99#include "logger.hpp"
    1010#include "verbose.hpp"
     11#include "Patterns/Singleton_impl.hpp"
    1112
    1213ofstream nullStream("/dev/null");
    1314
    14 logger* logger::instance = NULL;
    1515int logger::verbosity = 2;
    1616ostream* logger::nix = &nullStream;
    … …  
    2323logger::logger()
    2424{
    25   instance = NULL;
    2625  verbosity = 2;
    2726};
    … …  
    3433}
    3534
    36 /**
    37  * Returns the singleton logger instance.
    38  *
    39  * \return logger instance
    40  */
    41 logger* logger::getInstance() {
    42   if (instance == NULL) {
    43     instance = new logger();
    44   }
    45 
    46   return instance;
    47 }
    48 
    49 
    50 /**
    51  * Purges the current logger instance.
    52  */
    53 void logger::purgeInstance() {
    54   if (instance != NULL) {
    55     delete instance;
    56   }
    57 
    58   instance = NULL;
    59 }
     35CONSTRUCT_SINGLETON(logger)
    6036
    6137/**

  • molecuilder/src/logger.hpp

    r8a4f12 rc3f8c4  
    1111#include <iostream>
    1212
     13#include "Patterns/Singleton.hpp"
     14
    1315using namespace std;
    1416
    1517class Verbose;
    1618
    17 class logger {
     19class logger : public Singleton<logger> {
     20  friend class Singleton<logger>;
    1821public :
    1922  static ostream *nix;
    2023  static int verbosity;
    2124
    22   static logger* getInstance();
    23   static void purgeInstance();
    2425  static bool DoOutput();
    2526  static void setVerbosity(int verbosityLevel);
    … …  
    3031  /** Do not call this destructor directly, use purgeInstance() instead. */
    3132  ~logger();
    32 
    33 private:
    34   static logger* instance;
    3533};
    3634

  • molecuilder/src/unittests/logunittest.cpp

    r8a4f12 rc3f8c4  
    4040void LogTest::logTest()
    4141{
    42   logger::getInstance()->setVerbosity(2);
     42  logger::getInstance().setVerbosity(2);
    4343  Log() << Verbose(0) << "Verbosity level is set to 2." << endl;
    4444  Log() << Verbose(0) << "Test level 0" << endl;
Note: See TracChangeset for help on using the changeset viewer.