Changeset 72:493976b8c303 in rrlib_logging


Ignore:
Timestamp:
06.01.2012 18:55:08 (9 years ago)
Author:
Tobias Föhst <foehst@…>
Branch:
default
Phase:
public
Message:

Adapted to changes in rrlib_util

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • configuration/tConfiguration.cpp

    r71 r72  
    187187      parent = parent->parent; 
    188188    } 
    189     tDomainRegistry::GetInstance().UpdateMaxDomainNameLength(full_name_length + configuration->Name().length()); 
     189    tDomainRegistry::Instance().UpdateMaxDomainNameLength(full_name_length + configuration->Name().length()); 
    190190    this->children.insert(insertion_point, configuration); 
    191191  } 
  • messages/implementation.cpp

    r71 r72  
    7575const tConfiguration &GetConfiguration(const char *filename, const char *domain_name) 
    7676{ 
    77   if (domain_name) 
    78   { 
    79     if (domain_name[0] == '.') 
    80     { 
    81       return tDomainRegistry::GetInstance().GetGlobalConfiguration().GetConfigurationByName(domain_name + 1); 
    82     } 
    83     return tDomainRegistry::GetInstance().GetConfigurationByFilename(filename).GetConfigurationByName(domain_name); 
    84   } 
    85   return tDomainRegistry::GetInstance().GetConfigurationByFilename(filename); 
     77  return tDomainRegistry::Instance().GetConfiguration(filename, domain_name); 
    8678} 
    8779 
     
    139131{ 
    140132  char name_string_buffer[128]; 
    141   snprintf(name_string_buffer, sizeof(name_string_buffer), "%-*s ", static_cast<int>((tDomainRegistry::GetInstance().GetPadPrefixColumns() ? tDomainRegistry::GetInstance().MaxDomainNameLength() : 0)), domain_name.c_str()); 
     133  snprintf(name_string_buffer, sizeof(name_string_buffer), "%-*s ", static_cast<int>((tDomainRegistry::Instance().GetPadPrefixColumns() ? tDomainRegistry::Instance().MaxDomainNameLength() : 0)), domain_name.c_str()); 
    142134  stream << name_string_buffer; 
    143135} 
     
    177169  } 
    178170  char name_string_buffer[128]; 
    179   snprintf(name_string_buffer, sizeof(name_string_buffer), "%-*s ", (tDomainRegistry::GetInstance().GetPadPrefixColumns() ? 9 : 0), level_name); 
     171  snprintf(name_string_buffer, sizeof(name_string_buffer), "%-*s ", (tDomainRegistry::Instance().GetPadPrefixColumns() ? 9 : 0), level_name); 
    180172  stream << name_string_buffer; 
    181173} 
  • messages/tStream.cpp

    r71 r72  
    7474tStream::tStream(tStreamBuffer &stream_buffer) 
    7575    : stream(&stream_buffer), 
    76     lock(tStreamMutex::GetInstance()) 
     76    lock(tStreamMutex::Instance()) 
    7777{} 
    7878 
  • messages/tStreamBuffer.cpp

    r71 r72  
    203203void tStreamBuffer::InitializeMultiLinePadding() 
    204204{ 
    205   if (!tDomainRegistry::GetInstance().GetPadMultiLineMessages()) 
     205  if (!tDomainRegistry::Instance().GetPadMultiLineMessages()) 
    206206  { 
    207207    return; 
Note: See TracChangeset for help on using the changeset viewer.