Author: mlandres Date: Thu Oct 23 11:15:07 2008 New Revision: 11458 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11458&view=rev Log: enhance loging Modified: trunk/libzypp/zypp/ZConfig.cc trunk/libzypp/zypp/ZConfig.h trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc Modified: trunk/libzypp/zypp/ZConfig.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.cc?rev=11458&r1=11457&r2=11458&view=diff ============================================================================== --- trunk/libzypp/zypp/ZConfig.cc (original) +++ trunk/libzypp/zypp/ZConfig.cc Thu Oct 23 11:15:07 2008 @@ -30,6 +30,9 @@ using namespace zypp::filesystem; using namespace zypp::parser; +#undef ZYPP_BASE_LOGGER_LOGGROUP +#define ZYPP_BASE_LOGGER_LOGGROUP "zconfig" + /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// @@ -142,7 +145,8 @@ { public: Impl( const Pathname & override_r = Pathname() ) - : cfg_arch ( defaultSystemArchitecture() ) + : _parsedZyppConf ( override_r ) + , cfg_arch ( defaultSystemArchitecture() ) , cfg_textLocale ( defaultTextLocale() ) , repo_add_probe ( false ) , repo_refresh_delay ( 10 ) @@ -153,27 +157,23 @@ { MIL << "libzypp: " << VERSION << " built " << __DATE__ << " " << __TIME__ << endl; - - // override_r has higest prio + // override_r has higest prio // ZYPP_CONF might override /etc/zypp/zypp.conf - Pathname confpath( override_r ); - if ( confpath.empty() ) + if ( _parsedZyppConf.empty() ) { const char *env_confpath = getenv( "ZYPP_CONF" ); - confpath = env_confpath ? env_confpath : "/etc/zypp/zypp.conf"; + _parsedZyppConf = env_confpath ? env_confpath : "/etc/zypp/zypp.conf"; } else { // Inject this into ZConfig. Be shure this is // allocated via new. See: reconfigureZConfig - INT << "Reconfigure to " << confpath << endl; + INT << "Reconfigure to " << _parsedZyppConf << endl; ZConfig::instance()._pimpl.reset( this ); } - if ( PathInfo(confpath).isExist() ) + if ( PathInfo(_parsedZyppConf).isExist() ) { - parser::IniDict dict( confpath ); - //InputStream is(confpath); - + parser::IniDict dict( _parsedZyppConf ); for ( IniDict::section_const_iterator sit = dict.sectionsBegin(); sit != dict.sectionsEnd(); ++sit ) @@ -305,7 +305,8 @@ } else { - MIL << confpath << " not found, using defaults instead." << endl; + MIL << _parsedZyppConf << " not found, using defaults instead." << endl; + _parsedZyppConf.extend( " (NOT FOUND)" ); } // legacy: @@ -318,16 +319,16 @@ cfg_arch = carch; } } - MIL << "ZConfig singleton created." << endl; - MIL << "defaultTextLocale: '" << cfg_textLocale << "'" << endl; - MIL << "System architecture is '" << cfg_arch << "'" << endl; } ~Impl() {} public: + /** Remember any parsed zypp.conf. */ + Pathname _parsedZyppConf; + Arch cfg_arch; Locale cfg_textLocale; @@ -394,7 +395,9 @@ // ZConfig::ZConfig() : _pimpl( new Impl ) - {} + { + about( MIL); + } /////////////////////////////////////////////////////////////////// // @@ -599,6 +602,17 @@ Pathname("/etc/zypp/credentials.cat") : _pimpl->credentials_global_file_path ); } + /////////////////////////////////////////////////////////////////// + + std::ostream & ZConfig::about( std::ostream & str ) const + { + str << "libzypp: " << VERSION << " built " << __DATE__ << " " << __TIME__ << endl; + str << "zypp.conf: '" << _pimpl->_parsedZyppConf << "'" << endl; + str << "TextLocale: '" << textLocale() << "' (" << defaultTextLocale() << ")" << endl; + str << "SystemArchitecture: '" << systemArchitecture() << "' (" << defaultSystemArchitecture() << ")" << endl; + return str; + } + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/ZConfig.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.h?rev=11458&r1=11457&r2=11458&view=diff ============================================================================== --- trunk/libzypp/zypp/ZConfig.h (original) +++ trunk/libzypp/zypp/ZConfig.h Thu Oct 23 11:15:07 2008 @@ -59,6 +59,9 @@ /** Singleton ctor */ static ZConfig & instance(); + /** Print some detail about the current libzypp version.*/ + std::ostream & about( std::ostream & str ) const; + public: /** The autodetected system architecture. */ Modified: trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc?rev=11458&r1=11457&r2=11458&view=diff ============================================================================== --- trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc (original) +++ trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc Thu Oct 23 11:15:07 2008 @@ -43,9 +43,7 @@ : _target(0) , _resolver( new Resolver( ResPool::instance()) ) { - MIL << "libzypp: " << VERSION << " built " << __DATE__ << " " << __TIME__ << endl; - MIL << "defaultTextLocale: '" << ZConfig::instance().textLocale() << "'" << endl; - MIL << "System architecture is '" << ZConfig::instance().systemArchitecture() << "'" << endl; + ZConfig::instance().about( MIL ); MIL << "Initializing keyring..." << std::endl; _keyring = new KeyRing(tmpPath()); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org