Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tweak logging

Browse source
This commit is contained in:
Eric House 2013-06-22 05:54:32 -07:00
parent 25bf0e7191
commit c1cc11866f
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
xwords4/relay/cref.cpp
View file

@ -422,8 +422,8 @@ CookieRef::removeSocket( const AddrInfo* addr )
if ( iter->m_addr.equals( *addr ) ) {
if ( iter->m_ackPending ) {
logf( XW_LOGINFO,
"Never got ack; removing hid %d from DB",
iter->m_hostID );
"%s: Never got ack; removing hid %d from DB",
__func__, iter->m_hostID );
DBMgr::Get()->RmDeviceByHid( ConnName(),
iter->m_hostID );
m_nPlayersHere -= iter->m_nPlayersH;
@ -860,18 +860,17 @@ CookieRef::send_stored_messages( HostID dest, const AddrInfo* addr )
assert( dest > 0 && dest <= 4 );
if ( addr->isCurrent() ) {
DBMgr* dbmgr = DBMgr::Get();
const char* cname = ConnName();
for ( ; ; ) {
unsigned char buf[MAX_MSG_LEN];
size_t buflen = sizeof(buf);
int msgID;
if ( !DBMgr::Get()->GetStoredMessage( ConnName(), dest,
buf, &buflen, &msgID ) ) {
if ( !dbmgr->GetStoredMessage( cname, dest, buf, &buflen, &msgID )
|| ! send_with_length( addr, dest, buf, buflen, true ) ) {
break;
}
if ( ! send_with_length( addr, dest, buf, buflen, true ) ) {
break;
}
DBMgr::Get()->RemoveStoredMessages( &msgID, 1 );
dbmgr->RemoveStoredMessages( &msgID, 1 );
}
}
} /* send_stored_messages */
@ -1463,7 +1462,7 @@ CookieRef::logf( XW_LogLevel level, const char* format, ... )
char buf[256];
int len;
len = snprintf( buf, sizeof(buf), "cid:%d ", m_cid );
len = snprintf( buf, sizeof(buf), "cid:%d(%s) ", m_cid, m_connName.c_str() );
va_list ap;
va_start( ap, format );