[yast-commit] r40633 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/PkgModule.cc

Author: lslezak Date: Thu Aug 30 19:59:04 2007 New Revision: 40633 URL: http://svn.opensuse.org/viewcvs/yast?rev=40633&view=rev Log: - don't log debug messages from zypp if debug logging is turned off (#306458) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/PkgModule.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-bindings.changes?rev=40633&r1=40632&r2=40633&view=diff ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Thu Aug 30 19:59:04 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 30 19:57:49 CEST 2007 - lslezak@suse.cz + +- don't log debug messages from zypp if debug logging is turned off + (#306458) + +------------------------------------------------------------------- Wed Aug 29 09:36:00 CEST 2007 - lslezak@suse.cz - reimplemented Pkg::SourceCacheCopyTo() - copy zypp cache from the Modified: trunk/pkg-bindings/src/PkgModule.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgModule.cc?rev=40633&r1=40632&r2=40633&view=diff ============================================================================== --- trunk/pkg-bindings/src/PkgModule.cc (original) +++ trunk/pkg-bindings/src/PkgModule.cc Thu Aug 30 19:59:04 2007 @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -34,10 +35,34 @@ { virtual void writeOut( const std::string & formated_r ) { - y2lograw((formated_r+"\n").c_str()); + // don't log empty (debug) messages + if (!formated_r.empty()) + { + y2lograw((formated_r+"\n").c_str()); + } } }; +struct YaSTZyppFormatter : public zypp::base::LogControl::LineFormater +{ + virtual std::string format( const std::string & group_r, + zypp::base::logger::LogLevel level_r, + const char * file_r, + const char * func_r, + int line_r, + const std::string & message_r ) + { + if (get_log_debug() || level_r > zypp::base::logger::E_DBG) + { + // call the default implementation + return zypp::base::LogControl::LineFormater::format(group_r, level_r, file_r, func_r, line_r, message_r); + } + + // return empty string (ignore debug messages when debug is tuned off) + return std::string(); + } + +}; PkgModule* PkgModule::instance () { @@ -48,6 +73,9 @@ boost::shared_ptr<YaSTZyppLogger> myLogger( new YaSTZyppLogger ); zypp::base::LogControl::instance().setLineWriter( myLogger ); + boost::shared_ptr<YaSTZyppFormatter> myFormatter( new YaSTZyppFormatter ); + zypp::base::LogControl::instance().setLineFormater( myFormatter ); + current_pkg = new PkgModule (); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org