Changeset 69:25e5a60bd8e4 in rrlib_logging


Ignore:
Timestamp:
29.12.2011 23:45:29 (9 years ago)
Author:
Tobias Föhst <foehst@…>
Branch:
default
Parents:
68:b6821d4af878 (diff), 66:2c5c7ccc44a5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Transplant:
23f31f0d552195f9321a7db67362a53e80f34820
Message:

Merged with default

Files:
15 edited

Legend:

Unmodified
Added
Removed
  • configuration/tConfiguration.cpp

    r68 r69  
    33// Robotics Research Library 
    44// 
    5 // Copyright (C) AG Robotersysteme TU Kaiserslautern 
     5// Copyright (C) Finroc GbR (finroc.org) 
    66// 
    77// This program is free software; you can redistribute it and/or 
  • configuration/tConfiguration.h

    r68 r69  
    33// Robotics Research Library 
    44// 
    5 // Copyright (C) AG Robotersysteme TU Kaiserslautern 
     5// Copyright (C) Finroc GbR (finroc.org) 
    66// 
    77// This program is free software; you can redistribute it and/or 
  • configuration/tLogDomainRegistry.cpp

    r68 r69  
    33// Robotics Research Library 
    44// 
    5 // Copyright (C) AG Robotersysteme TU Kaiserslautern 
     5// Copyright (C) Finroc GbR (finroc.org) 
    66// 
    77// This program is free software; you can redistribute it and/or 
  • configuration/tLogDomainRegistry.h

    r68 r69  
    33// Robotics Research Library 
    44// 
    5 // Copyright (C) AG Robotersysteme TU Kaiserslautern 
     5// Copyright (C) Finroc GbR (finroc.org) 
    66// 
    77// This program is free software; you can redistribute it and/or 
  • default_log_description.cpp

    r68 r69  
    33// Robotics Research Library 
    44// 
    5 // Copyright (C) AG Robotersysteme TU Kaiserslautern 
     5// Copyright (C) Finroc GbR (finroc.org) 
    66// 
    77// This program is free software; you can redistribute it and/or 
  • log_levels.h

    r68 r69  
    33// Robotics Research Library 
    44// 
    5 // Copyright (C) AG Robotersysteme TU Kaiserslautern 
     5// Copyright (C) Finroc GbR (finroc.org) 
    66// 
    77// This program is free software; you can redistribute it and/or 
  • messages.h

    r68 r69  
    33// Robotics Research Library 
    44// 
    5 // Copyright (C) AG Robotersysteme TU Kaiserslautern 
     5// Copyright (C) Finroc GbR (finroc.org) 
    66// 
    77// This program is free software; you can redistribute it and/or 
  • messages/implementation.cpp

    r68 r69  
    33// Robotics Research Library 
    44// 
    5 // Copyright (C) AG Robotersysteme TU Kaiserslautern 
     5// Copyright (C) Finroc GbR (finroc.org) 
    66// 
    77// This program is free software; you can redistribute it and/or 
  • messages/implementation.h

    r68 r69  
    33// Robotics Research Library 
    44// 
    5 // Copyright (C) AG Robotersysteme TU Kaiserslautern 
     5// Copyright (C) Finroc GbR (finroc.org) 
    66// 
    77// This program is free software; you can redistribute it and/or 
  • tLogDomain.cpp

    r65 r69  
    145145  { 
    146146    std::cerr << "RRLib Logging >> Prefix for file names not set. Can not use eMS_FILE." << std::endl 
    147               << "                 Consider calling tMessageDomainRegistry::GetInstance()->SetOutputFileNamePrefix(basename(argv[0])) for example." << std::endl; 
     147              << "                 Consider calling tLogDomainRegistry::GetInstance()->SetOutputFileNamePrefix(basename(argv[0])) for example." << std::endl; 
    148148    return false; 
    149149  } 
  • tLogDomain.cpp

    r68 r69  
    33// Robotics Research Library 
    44// 
    5 // Copyright (C) AG Robotersysteme TU Kaiserslautern 
     5// Copyright (C) Finroc GbR (finroc.org) 
    66// 
    77// This program is free software; you can redistribute it and/or 
  • tLogDomain.h

    r65 r69  
    3434 * can be created and configured via tLogDomainRegistry. That given, 
    3535 * in the program implementation instances of the class tLogDomain 
    36  * wrap the stream that can be access either in C++ iostream style via 
     36 * wrap the stream that can be accessed either in C++ iostream style via 
    3737 * operator << or in good old-fashioned C style using printf formatting. 
    3838 * 
  • tLogDomain.h

    r68 r69  
    33// Robotics Research Library 
    44// 
    5 // Copyright (C) AG Robotersysteme TU Kaiserslautern 
     5// Copyright (C) Finroc GbR (finroc.org) 
    66// 
    77// This program is free software; you can redistribute it and/or 
  • test/test_messages.cpp

    r65 r69  
    4242} 
    4343 
    44 #include "rrlib/util/stl_container/join.h" 
     44#include "rrlib/util/join.h" 
    4545 
    4646//---------------------------------------------------------------------- 
     
    5353// Debugging 
    5454//---------------------------------------------------------------------- 
    55 #include "rrlib/logging/test/debugging.h" 
    5655 
    5756//---------------------------------------------------------------------- 
     
    7574{ 
    7675 
    77 RRLIB_LOG_CREATE_DEFAULT_DOMAIN("local"); 
    78  
    7976struct Test 
    8077{ 
    81   RRLIB_LOG_CREATE_NAMED_DOMAIN(my_domain, "class"); 
    82  
    8378  static void function() 
    8479  { 
    85     RRLIB_LOG_PRINT(eLL_DEBUG_WARNING, my_domain, "this ", "is a ", "local class test"); 
     80    RRLIB_LOG_PRINT_EXPLICIT(eLL_DEBUG_WARNING, "my_domain", "this ", "is a ", "local class test"); 
    8681 
    8782    RRLIB_LOG_PRINT(eLL_WARNING, "foo"); 
    88     RRLIB_LOG_PRINT(eLL_ERROR, my_domain, "foo2"); 
     83    RRLIB_LOG_PRINT_EXPLICIT(eLL_ERROR, "my_domain", "foo2"); 
    8984    if (true) 
    9085    { 
    91       RRLIB_LOG_PRINTF(eLL_DEBUG, my_domain, "%s\n", "FOO"); 
     86      RRLIB_LOG_PRINTF_EXPLICIT(eLL_DEBUG, "my_domain", "%s\n", "FOO"); 
    9287    } 
    9388  } 
     
    127122#endif 
    128123 
    129   tLogDomainRegistry::GetInstance()->SetOutputFileNamePrefix(basename(argv[0])); 
     124//  tLogDomainRegistry::GetInstance()->SetOutputFileNamePrefix(basename(argv[0])); 
    130125 
    131126 
     
    154149  local::Test::function(); 
    155150 
    156   DEBUGMSG("blablabla Debug"); 
    157   INFOMSG("blablabla Info"); 
    158   WARNINGMSG("blablabla Warning"); 
    159   ERRORMSG("blablabla Error"); 
    160   USERMSG("blablabla User"); 
    161  
    162   RRLIB_LOG_PRINT(eLL_ERROR, std::runtime_error("runtime_error")); 
     151//  RRLIB_LOG_PRINT(eLL_ERROR, std::runtime_error("runtime_error")); 
    163152 
    164153  RRLIB_LOG_PRINT(eLL_WARNING, std::hex, 324); 
     
    168157 
    169158  const char* texts[] = {"Dies", "ist", "ein", "kleiner", "Text."}; 
    170   //std::copy(&texts[0], &texts[0] + 5, std::ostream_iterator<const char*>(RRLIB_LOG_PRINT(eLL_DEBUG), " "));   that is not pretty. use the following line.... 
    171159  RRLIB_LOG_PRINT(eLL_DEBUG, rrlib::util::Join(texts, texts + 5, " ")); 
    172160 
  • test/test_messages.cpp

    r68 r69  
    33// Robotics Research Library 
    44// 
    5 // Copyright (C) AG Robotersysteme TU Kaiserslautern 
     5// Copyright (C) Finroc GbR (finroc.org) 
    66// 
    77// This program is free software; you can redistribute it and/or 
Note: See TracChangeset for help on using the changeset viewer.