diff options
author | Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi> | 2011-02-14 13:37:59 +0200 |
---|---|---|
committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2011-02-15 23:55:26 +0100 |
commit | 76a4acdb380b0b3d78cdc7bb149e5f96b2cabf63 (patch) | |
tree | 69a56ce288f83a9db3b45a983d48ff5188824723 /tntconfig.cpp | |
parent | 825141eb0e7c67848d1c89ed88c6a8f786462bff (diff) | |
download | vdr-plugin-live-76a4acdb380b0b3d78cdc7bb149e5f96b2cabf63.tar.gz vdr-plugin-live-76a4acdb380b0b3d78cdc7bb149e5f96b2cabf63.tar.bz2 |
Initialize both tntnet and cxxtools logging earlier and add all possible log level values into the command-line help.
Diffstat (limited to 'tntconfig.cpp')
-rw-r--r-- | tntconfig.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tntconfig.cpp b/tntconfig.cpp index bf811f1..96db7aa 100644 --- a/tntconfig.cpp +++ b/tntconfig.cpp @@ -148,6 +148,7 @@ namespace vdrlive { // XXX modularize file << "rootLogger=" << LiveSetup().GetTntnetLogLevel() << endl; file << "logger.tntnet=" << LiveSetup().GetTntnetLogLevel() << endl; + file << "logger.cxxtools=" << LiveSetup().GetTntnetLogLevel() << endl; } #endif @@ -156,6 +157,13 @@ namespace vdrlive { { string const configDir(Plugin::GetConfigDirectory()); + std::istringstream logConf( + "rootLogger=" + LiveSetup().GetTntnetLogLevel() + "\n" + "logger.tntnet=" + LiveSetup().GetTntnetLogLevel() + "\n" + "logger.cxxtools=" + LiveSetup().GetTntnetLogLevel() + "\n" + ); + log_init(logConf); + // +++ CAUTION +++ CAUTION +++ CAUTION +++ CAUTION +++ CAUTION +++ // ------------------------------------------------------------------------ // These mapUrl statements are very security sensitive! @@ -290,13 +298,6 @@ namespace vdrlive { esyslog( "[live] ERROR: Unable to load cert/key (%s/%s): %s", s_cert.c_str(), s_key.c_str(), strerror( errno ) ); } #endif // TNT_SSL_SUPPORT - - std::istringstream logConf( - "rootLogger=" + LiveSetup().GetTntnetLogLevel() + "\n" - // "logger.tntnet.static=DEBUG\n" - // "logger.cxxtools.net.tcp=DEBUG\n" - ); - log_init(logConf); } #endif |