Subversion Repositories tpanel

Rev

Rev 406 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 406 Rev 414
Line 203... Line 203...
203 
        mLogfile = TConfig::getLogFile();
 203 
        mLogfile = TConfig::getLogFile();
204 
 
 204 
 
205 
    if (!logLevel.empty())
 205 
    if (!logLevel.empty())
206 
        setLogLevel(logLevel);
 206 
        setLogLevel(logLevel);
207 
    else if (!TConfig::getLogLevel().empty())
 207 
    else if (!TConfig::getLogLevel().empty())
208 
        setLogLevel(TConfig::getLogFile());
 208 
        setLogLevel(TConfig::getLogLevel());
209 
 
 209 
 
210 
    _init();
 210 
    _init();
211 
}
 211 
}
212 
 
 212 
 
213 
TStreamError::~TStreamError()
 213 
TStreamError::~TStreamError()
Line 266... Line 266...
266 
 
 266 
 
267 
    mLogLevel |= _getLevel(slv.substr(start));
 267 
    mLogLevel |= _getLevel(slv.substr(start));
268 
#ifdef __ANDROID__
 268 
#ifdef __ANDROID__
269 
    __android_log_print(ANDROID_LOG_INFO, "tpanel", "TStreamError::setLogLevel: New loglevel: %s", slv.c_str());
 269 
    __android_log_print(ANDROID_LOG_INFO, "tpanel", "TStreamError::setLogLevel: New loglevel: %s", slv.c_str());
270 
#else
 270 
#else
271 
    if (TError::Current()->getStream())
 271 
    if (mInitialized && mStream)
272 
        *TError::Current()->getStream() << TError::append(HLOG_INFO) << "New loglevel: " << slv << std::endl;
 272 
        *mStream << TError::append(HLOG_INFO) << "New loglevel: " << slv << std::endl;
273 
    else
 273 
    else
274 
        std::cout << TError::append(HLOG_INFO) << "New loglevel: " << slv << std::endl;
 274 
        std::cout << TError::append(HLOG_INFO) << "New loglevel: " << slv << std::endl;
275 
#endif
 275 
#endif
276 
}
 276 
}
277 
 
 277 
 
Line 378... Line 378...
378 
            if (!isStreamValid())
 378 
            if (!isStreamValid())
379 
            {
 379 
            {
380 
                if (mOfStream.is_open())
 380 
                if (mOfStream.is_open())
381 
                    mOfStream.close();
 381 
                    mOfStream.close();
382 
 
 382 
 
- 
 
 383 
                delete mStream;
383 
                mStream = &std::cout;
 384 
                mStream = &std::cout;
384 
            }
 385 
            }
385 
#else   //__ANDROID__
 386 
#else   //__ANDROID__
386 
            char *HOME = getenv("HOME");
 387 
            char *HOME = getenv("HOME");
387 
            bool bigLog = false;
 388 
            bool bigLog = false;
Line 451... Line 452...
451 
#ifdef __ANDROID__
 452 
#ifdef __ANDROID__
452 
        __android_log_print(ANDROID_LOG_DEBUG, "tpanel", "TStreamError::_init: Stream wurde auf std::cout gesetzt.");
 453 
        __android_log_print(ANDROID_LOG_DEBUG, "tpanel", "TStreamError::_init: Stream wurde auf std::cout gesetzt.");
453 
#else
 454 
#else
454 
        std::cout << "DEBUG: Stream wurde auf std::cout gesetzt." << std::endl;
 455 
        std::cout << "DEBUG: Stream wurde auf std::cout gesetzt." << std::endl;
455 
#endif  // __ANDROID__
 456 
#endif  // __ANDROID__
456 
#endif
 457 
#endif  // defined(QT_DEBUG) || defined(DEBUG)
457 
    }
 458 
    }
458 
#else  // LOGPATH == LPATH_FILE
 459 
#else  // LOGPATH == LPATH_FILE
459 
    if (!mStream)
 460 
    if (!mStream)
460 
    {
 461 
    {
461 
#if defined(__ANDROID__) || defined(__IOS_AVAILABLE)
 462 
#if defined(__ANDROID__) || defined(__IOS_AVAILABLE)