iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-01 02:52:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use that new define everywhere

Browse Source 
Now there are no uses of DEBUG_ONLY() left :(


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1349 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2009-01-25 16:51:54 +00:00
parent 8d8bbb0920
commit 235b10c200
15 changed files with 80 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
znc.cpp
View File

@@ -146,12 +146,12 @@ bool CZNC::ConnectUser(CUser *pUser) {
return false;
if (!WriteISpoof(pUser)) {
DEBUG_ONLY(cout << "ISpoof could not be written" << endl);
DEBUG("ISpoof could not be written");
pUser->PutStatus("ISpoof could not be written, retrying...");
return true;
}
DEBUG_ONLY(cout << "User [" << pUser->GetUserName() << "] is connecting to [" << pServer->GetName() << ":" << pServer->GetPort() << "] ..." << endl);
DEBUG("User [" << pUser->GetUserName() << "] is connecting to [" << pServer->GetName() << ":" << pServer->GetPort() << "] ...");
pUser->PutStatus("Attempting to connect to [" + pServer->GetName() + ":" + CString(pServer->GetPort()) + "] ...");
pIRCSock = new CIRCSock(pUser);
@@ -558,14 +558,14 @@ bool CZNC::WriteConfig() {
CString sErr;
if (!it->second->IsValid(sErr)) {
DEBUG_ONLY(cerr << "** Error writing config for user [" << it->first << "] [" << sErr << "]" << endl);
DEBUG("** Error writing config for user [" << it->first << "] [" << sErr << "]");
continue;
}
File.Write("\n");
if (!it->second->WriteConfig(File)) {
DEBUG_ONLY(cerr << "** Error writing config for user [" << it->first << "]" << endl);
DEBUG("** Error writing config for user [" << it->first << "]");
}
}
@@ -1065,7 +1065,7 @@ bool CZNC::DoRehash(CString& sError)
if (!pRealUser->Clone(*pUser, sErr)
|| !AddUser(pRealUser, sErr)) {
sError = "Invalid user [" + pUser->GetUserName() + "] " + sErr;
DEBUG_ONLY(cout << "CUser::Clone() failed in rehash" << endl);
DEBUG("CUser::Clone() failed in rehash");
}
pUser->SetBeingDeleted(true);
delete pUser;
@@ -1695,18 +1695,16 @@ bool CZNC::DeleteUser(const CString& sUsername) {
bool CZNC::AddUser(CUser* pUser, CString& sErrorRet) {
if (FindUser(pUser->GetUserName()) != NULL) {
DEBUG_ONLY(cout << "User [" << pUser->GetUserName() << "]"
" - already exists" << endl);
DEBUG("User [" << pUser->GetUserName() << "] - already exists");
return false;
}
if (!pUser->IsValid(sErrorRet)) {
DEBUG_ONLY(cout << "Invalid user [" << pUser->GetUserName() << "]"
" - [" << sErrorRet << "]" << endl);
DEBUG("Invalid user [" << pUser->GetUserName() << "] - ["
<< sErrorRet << "]");
return false;
}
m_msUsers[pUser->GetUserName()] = pUser;
return true;
}
CZNC& CZNC::Get() {
@@ -1814,8 +1812,7 @@ protected:
// The timer runs until it once didn't find any users to connect
bUsersLeft = true;
DEBUG_ONLY(cout << "Connecting user [" << pUser->GetUserName()
<< "]" << endl);
DEBUG("Connecting user [" << pUser->GetUserName() << "]");
if (CZNC::Get().ConnectUser(pUser))
// User connecting, wait until next time timer fires
@@ -1823,7 +1820,7 @@ protected:
}
if (bUsersLeft == false) {
DEBUG_ONLY(cout << "ConnectUserTimer done" << endl);
DEBUG("ConnectUserTimer done");
CZNC::Get().DisableConnectUser();
}
}