From 9bbf7cec5bd2dedb1ab342e2245a8e786d12fd3d Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Wed, 1 Feb 2006 14:26:14 +0000 Subject: [PATCH] - Disable loggin level XXX unless $ZYPP_FULLLOG is set in the environment. --- zypp/base/Logger.cc | 4 +++- zypp/base/Logger.h | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/zypp/base/Logger.cc b/zypp/base/Logger.cc index 4d7c72e..9412c05 100644 --- a/zypp/base/Logger.cc +++ b/zypp/base/Logger.cc @@ -46,7 +46,9 @@ namespace zypp { static std::ostream & outStr( getenv("ZYPP_NOLOG") ? noStream() : std::cerr ); - return outStr + static std::ostream & fullStr( getenv("ZYPP_FULLLOG") ? outStr + : noStream() ); + return (level_r != E_XXX ? outStr : fullStr ) << str::form( "<%d> [%s] %s(%s):%d ", level_r, group_r, file_r, func_r, line_r ); diff --git a/zypp/base/Logger.h b/zypp/base/Logger.h index 8e3ca62..f5f15f0 100644 --- a/zypp/base/Logger.h +++ b/zypp/base/Logger.h @@ -81,14 +81,14 @@ namespace zypp * @see getStream */ enum LogLevel { - E_XXX = -1, /**< Excessive logging. */ - E_DBG = 0, /**< Debug or verbose. */ - E_MIL, /**< Milestone. */ - E_WAR, /**< Warning. */ - E_ERR, /**< Error. */ - E_SEC, /**< Secutrity related. */ - E_INT, /**< Internal error. */ - E_USR /**< User log. */ + E_XXX = 999, /**< Excessive logging. */ + E_DBG = 0, /**< Debug or verbose. */ + E_MIL, /**< Milestone. */ + E_WAR, /**< Warning. */ + E_ERR, /**< Error. */ + E_SEC, /**< Secutrity related. */ + E_INT, /**< Internal error. */ + E_USR /**< User log. */ }; /** Return a log stream to write on. -- 2.7.4