Subversion Repositories tpanel

Rev

Rev 474 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 474 Rev 484
Line 263... Line 263...
263 
        mLogLevel |= _getLevel(lv);
 263 
        mLogLevel |= _getLevel(lv);
264 
        pos = slv.find("|", start);
 264 
        pos = slv.find("|", start);
265 
    }
 265 
    }
266 
 
 266 
 
267 
    mLogLevel |= _getLevel(slv.substr(start));
 267 
    mLogLevel |= _getLevel(slv.substr(start));
- 
 
 268 
 
268 
#ifdef __ANDROID__
 269 
#ifdef __ANDROID__
269 
    __android_log_print(ANDROID_LOG_INFO, "tpanel", "TStreamError::setLogLevel: New loglevel: %s", slv.c_str());
 270 
    __android_log_print(ANDROID_LOG_INFO, "tpanel", "TStreamError::setLogLevel: New loglevel: %s", slv.c_str());
270 
#else
 271 
#else
- 
 
 272 
#ifdef TARGET_OS_IOS
- 
 
 273 
    std::cout << TError::append(HLOG_INFO) << "New loglevel: " << slv << std::endl;
- 
 
 274 
#else
271 
    if (mInitialized && mStream)
 275 
    if (mInitialized && mStream)
272 
        *mStream << TError::append(HLOG_INFO) << "New loglevel: " << slv << std::endl;
 276 
        *mStream << TError::append(HLOG_INFO) << "New loglevel: " << slv << std::endl;
273 
    else
 277 
    else
274 
        std::cout << TError::append(HLOG_INFO) << "New loglevel: " << slv << std::endl;
 278 
        std::cout << TError::append(HLOG_INFO) << "New loglevel: " << slv << std::endl;
275 
#endif
 279 
#endif
- 
 
 280 
#endif
276 
}
 281 
}
277 
 
 282 
 
278 
bool TStreamError::checkFilter(terrtype_t err)
 283 
bool TStreamError::checkFilter(terrtype_t err)
279 
{
 284 
{
280 
    if (!TConfig::isInitialized())
 285 
    if (!TConfig::isInitialized())
Line 884... Line 889...
884 
    return os << append(lv);
 889 
    return os << append(lv);
885 
}
 890 
}
886 
 
 891 
 
887 
std::string TError::append(int lv)
 892 
std::string TError::append(int lv)
888 
{
 893 
{
889 
    std::lock_guard<mutex> guard(message_mutex);
 894 
//    std::lock_guard<mutex> guard(message_mutex);
890 
    std::string prefix, out;
 895 
    std::string prefix, out;
891 
 
 896 
 
892 
    switch (lv)
 897 
    switch (lv)
893 
    {
 898 
    {
894 
        case HLOG_PROTOCOL: prefix = "PRT    ++, "; mErrType = TERRINFO; break;
 899 
        case HLOG_PROTOCOL: prefix = "PRT    ++, "; mErrType = TERRINFO; break;