games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Server: convert logging

Browse Source
This commit is contained in:
AlexVinS
2016-08-30 01:11:54 +03:00
parent 668cd83ee5
commit 85f94676a5
4 changed files with 96 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
server/CGameHandler.cpp
View File

@@ -108,7 +108,7 @@ class CApplyOnGH<CPack> : public CBaseForGHApply
public: public:
bool applyOnGH(CGameHandler *gh, CConnection *c, void *pack, PlayerColor player) const bool applyOnGH(CGameHandler *gh, CConnection *c, void *pack, PlayerColor player) const
{ {
logGlobal->errorStream() << "Cannot apply on GH plain CPack!"; logGlobal->error("Cannot apply on GH plain CPack!");
assert(0); assert(0);
return false; return false;
} }
@@ -203,7 +203,7 @@ void CGameHandler::levelUpHero(const CGHeroInstance * hero)
} }
// give primary skill // give primary skill
logGlobal->traceStream() << hero->name << " got level "<< hero->level; logGlobal->trace("%s got level %d", hero->name, hero->level);
auto primarySkill = hero->nextPrimarySkill(); auto primarySkill = hero->nextPrimarySkill();
SetPrimSkill sps; SetPrimSkill sps;
@@ -490,7 +490,7 @@ void CGameHandler::endBattle(int3 tile, const CGHeroInstance *hero1, const CGHer
auto battleQuery = findBattleQuery(); auto battleQuery = findBattleQuery();
if(!battleQuery) if(!battleQuery)
{ {
logGlobal->errorStream() << "Cannot find battle query!"; logGlobal->error("Cannot find battle query!");
if(gs->initialOpts->mode == StartInfo::DUEL) if(gs->initialOpts->mode == StartInfo::DUEL)
{ {
battleQuery = std::make_shared<CBattleQuery>(gs->curB); battleQuery = std::make_shared<CBattleQuery>(gs->curB);
@@ -698,7 +698,7 @@ void CGameHandler::battleAfterLevelUp( const BattleResult &result )
finishingBattle->remainingBattleQueriesCount--; finishingBattle->remainingBattleQueriesCount--;
logGlobal->traceStream() << "Decremented queries count to " << finishingBattle->remainingBattleQueriesCount; logGlobal->trace("Decremented queries count to %d", finishingBattle->remainingBattleQueriesCount);
if(finishingBattle->remainingBattleQueriesCount > 0) if(finishingBattle->remainingBattleQueriesCount > 0)
//Battle results will be handled when all battle queries are closed //Battle results will be handled when all battle queries are closed
@@ -729,7 +729,7 @@ void CGameHandler::battleAfterLevelUp( const BattleResult &result )
if(visitObjectAfterVictory && result.winner==0 && !finishingBattle->winnerHero->stacks.empty()) if(visitObjectAfterVictory && result.winner==0 && !finishingBattle->winnerHero->stacks.empty())
{ {
logGlobal->traceStream() << "post-victory visit"; logGlobal->trace("post-victory visit");
visitObjectOnTile(*getTile(finishingBattle->winnerHero->getPosition()), finishingBattle->winnerHero); visitObjectOnTile(*getTile(finishingBattle->winnerHero->getPosition()), finishingBattle->winnerHero);
} }
visitObjectAfterVictory = false; visitObjectAfterVictory = false;
@@ -936,13 +936,13 @@ void CGameHandler::handleConnection(std::set<PlayerColor> players, CConnection &
if(!pack) if(!pack)
{ {
logGlobal ->errorStream() << boost::format("Received a null package marked as request %d from player %d") % requestID % player; logGlobal->error("Received a null package marked as request %d from player %d", requestID, player);
} }
packType = typeList.getTypeID(pack); //get the id of type packType = typeList.getTypeID(pack); //get the id of type
logGlobal->traceStream() << boost::format("Received client message (request %d by player %d) of type with ID=%d (%s).\n") logGlobal->trace("Received client message (request %d by player %d) of type with ID=%d (%s).\n",
% requestID % player.getNum() % packType % typeid(*pack).name(); requestID, player.getNum(), packType, typeid(*pack).name());
} }
//prepare struct informing that action was applied //prepare struct informing that action was applied
@@ -965,17 +965,17 @@ void CGameHandler::handleConnection(std::set<PlayerColor> players, CConnection &
else if(apply) else if(apply)
{ {
const bool result = apply->applyOnGH(this,&c,pack, player); const bool result = apply->applyOnGH(this,&c,pack, player);
if(!result) if(result)
{ logGlobal->trace("Message successfully applied!");
else
complain((boost::format("Got false in applying %s... that request must have been fishy!") complain((boost::format("Got false in applying %s... that request must have been fishy!")
% typeid(*pack).name()).str()); % typeid(*pack).name()).str());
}
logGlobal->traceStream() << "Message successfully applied (result=" << result << ")!";
sendPackageResponse(true); sendPackageResponse(true);
} }
else else
{ {
logGlobal->errorStream() << "Message cannot be applied, cannot find applier (unregistered type)!"; logGlobal->error("Message cannot be applied, cannot find applier (unregistered type)!");
sendPackageResponse(false); sendPackageResponse(false);
} }
@@ -985,7 +985,7 @@ void CGameHandler::handleConnection(std::set<PlayerColor> players, CConnection &
catch(boost::system::system_error &e) //for boost errors just log, not crash - probably client shut down connection catch(boost::system::system_error &e) //for boost errors just log, not crash - probably client shut down connection
{ {
assert(!c.connected); //make sure that connection has been marked as broken assert(!c.connected); //make sure that connection has been marked as broken
logGlobal->errorStream() << e.what(); logGlobal->error(e.what());
end2 = true; end2 = true;
} }
catch(...) catch(...)
@@ -995,7 +995,7 @@ void CGameHandler::handleConnection(std::set<PlayerColor> players, CConnection &
throw; throw;
} }
logGlobal->errorStream() << "Ended handling connection"; logGlobal->error("Ended handling connection");
} }
int CGameHandler::moveStack(int stack, BattleHex dest) int CGameHandler::moveStack(int stack, BattleHex dest)
@@ -1332,9 +1332,9 @@ void CGameHandler::init(StartInfo *si)
} }
gs = new CGameState(); gs = new CGameState();
logGlobal->infoStream() << "Gamestate created!"; logGlobal->info("Gamestate created!");
gs->init(si); gs->init(si);
logGlobal->infoStream() << "Gamestate initialized!"; logGlobal->info("Gamestate initialized!");
// reset seed, so that clients can't predict any following random values // reset seed, so that clients can't predict any following random values
gs->getRandomGenerator().resetSeed(); gs->getRandomGenerator().resetSeed();
@@ -1355,7 +1355,7 @@ void CGameHandler::setPortalDwelling(const CGTownInstance * town, bool forced=fa
const PlayerState *p = gs->getPlayer(town->tempOwner); const PlayerState *p = gs->getPlayer(town->tempOwner);
if(!p) if(!p)
{ {
logGlobal->warnStream() << "There is no player owner of town " << town->name << " at " << town->pos; logGlobal->warn("There is no player owner of town %s at %s", town->name, town->pos());
return; return;
} }
@@ -1393,7 +1393,7 @@ void CGameHandler::setPortalDwelling(const CGTownInstance * town, bool forced=fa
void CGameHandler::newTurn() void CGameHandler::newTurn()
{ {
logGlobal->traceStream() << "Turn " << gs->day+1; logGlobal->trace("Turn %d", gs->day+1);
NewTurn n; NewTurn n;
n.specialWeek = NewTurn::NO_ACTION; n.specialWeek = NewTurn::NO_ACTION;
n.creatureid = CreatureID::NONE; n.creatureid = CreatureID::NONE;
@@ -1707,7 +1707,7 @@ void CGameHandler::newTurn()
} }
} }
logGlobal->traceStream() << "Info about turn " << n.day << "has been sent!"; logGlobal->trace("Info about turn %d has been sent!", n.day);
handleTimeEvents(); handleTimeEvents();
//call objects //call objects
for(auto & elem : gs->map->objects) for(auto & elem : gs->map->objects)
@@ -1743,7 +1743,7 @@ void CGameHandler::run(bool resume)
connections[color] = cc; connections[color] = cc;
} }
} }
logGlobal->infoStream() << sbuffer.str(); logGlobal->info(sbuffer.str());
cc->addStdVecItems(gs); cc->addStdVecItems(gs);
cc->enableStackSendingByID(); cc->enableStackSendingByID();
@@ -1921,7 +1921,7 @@ bool CGameHandler::removeObject( const CGObjectInstance * obj )
{ {
if(!obj || !getObj(obj->id)) if(!obj || !getObj(obj->id))
{ {
logGlobal->errorStream() << "Something wrong, that object already has been removed or hasn't existed!"; logGlobal->error("Something wrong, that object already has been removed or hasn't existed!");
return false; return false;
} }
@@ -1946,16 +1946,16 @@ bool CGameHandler::moveHero( ObjectInstanceID hid, int3 dst, ui8 teleporting, bo
if(!h || (asker != PlayerColor::NEUTRAL && (teleporting || h->getOwner() != gs->currentPlayer)) //not turn of that hero or player can't simply teleport hero (at least not with this function) if(!h || (asker != PlayerColor::NEUTRAL && (teleporting || h->getOwner() != gs->currentPlayer)) //not turn of that hero or player can't simply teleport hero (at least not with this function)
) )
{ {
logGlobal->errorStream() << "Illegal call to move hero!"; logGlobal->error("Illegal call to move hero!");
return false; return false;
} }
logGlobal->traceStream() << "Player " << asker << " wants to move hero "<< hid.getNum() << " from "<< h->pos << " to " << dst; logGlobal->trace("Player %d wants to move hero %d from %s to %s", asker.getNum(), hid.getNum(), h->pos(), dst());
const int3 hmpos = CGHeroInstance::convertPosition(dst, false); const int3 hmpos = CGHeroInstance::convertPosition(dst, false);
if(!gs->map->isInTheMap(hmpos)) if(!gs->map->isInTheMap(hmpos))
{ {
logGlobal->errorStream() << "Destination tile is outside the map!"; logGlobal->error("Destination tile is outside the map!");
return false; return false;
} }
@@ -2048,7 +2048,7 @@ bool CGameHandler::moveHero( ObjectInstanceID hid, int3 dst, ui8 teleporting, bo
} }
queries.popIfTop(moveQuery); queries.popIfTop(moveQuery);
logGlobal->traceStream() << "Hero " << h->name << " ends movement"; logGlobal->trace("Hero %s ends movement", h->name);
return result != TryMoveHero::FAILED; return result != TryMoveHero::FAILED;
}; };
@@ -2132,7 +2132,7 @@ bool CGameHandler::teleportHero(ObjectInstanceID hid, ObjectInstanceID dstid, ui
const CGTownInstance *t = getTown(dstid); const CGTownInstance *t = getTown(dstid);
if ( !h || !t || h->getOwner() != gs->currentPlayer ) if ( !h || !t || h->getOwner() != gs->currentPlayer )
logGlobal->errorStream() << "Invalid call to teleportHero!"; logGlobal->error("Invalid call to teleportHero!");
const CGTownInstance *from = h->visitedTown; const CGTownInstance *from = h->visitedTown;
if(((h->getOwner() != t->getOwner()) if(((h->getOwner() != t->getOwner())
@@ -2507,7 +2507,7 @@ void CGameHandler::heroExchange(ObjectInstanceID hero1, ObjectInstanceID hero2)
void CGameHandler::sendToAllClients( CPackForClient * info ) void CGameHandler::sendToAllClients( CPackForClient * info )
{ {
logGlobal->traceStream() << "Sending to all clients a package of type " << typeid(*info).name(); logGlobal->trace("Sending to all clients a package of type %s", typeid(*info).name());
for(auto & elem : conns) for(auto & elem : conns)
{ {
boost::unique_lock<boost::mutex> lock(*(elem)->wmx); boost::unique_lock<boost::mutex> lock(*(elem)->wmx);
@@ -2553,44 +2553,36 @@ void CGameHandler::sendAndApply( NewStructures * info )
void CGameHandler::save(const std::string & filename ) void CGameHandler::save(const std::string & filename )
{ {
logGlobal->infoStream() << "Saving to " << filename; logGlobal->info("Saving to %s", filename);
const auto stem = FileInfo::GetPathStem(filename); const auto stem = FileInfo::GetPathStem(filename);
const auto savefname = stem.to_string() + ".vsgm1"; const auto savefname = stem.to_string() + ".vsgm1";
CResourceHandler::get("local")->createResource(savefname); CResourceHandler::get("local")->createResource(savefname);
{ {
logGlobal->infoStream() << "Ordering clients to serialize..."; logGlobal->info("Ordering clients to serialize...");
SaveGame sg(savefname); SaveGame sg(savefname);
sendToAllClients(&sg); sendToAllClients(&sg);
} }
try try
{ {
// {
// logGlobal->infoStream() << "Serializing game info...";
// CSaveFile save(CResourceHandler::get("local")->getResourceName(ResourceID(info.getStem(), EResType::LIB_SAVEGAME)));
// // char hlp[8] = "VCMISVG";
// // save << hlp;
// saveCommonState(save);
// }
{ {
CSaveFile save(*CResourceHandler::get("local")->getResourceName(ResourceID(stem.to_string(), EResType::SERVER_SAVEGAME))); CSaveFile save(*CResourceHandler::get("local")->getResourceName(ResourceID(stem.to_string(), EResType::SERVER_SAVEGAME)));
saveCommonState(save); saveCommonState(save);
logGlobal->infoStream() << "Saving server state"; logGlobal->info("Saving server state");
save << *this; save << *this;
} }
logGlobal->infoStream() << "Game has been successfully saved!"; logGlobal->info("Game has been successfully saved!");
} }
catch(std::exception &e) catch(std::exception &e)
{ {
logGlobal->errorStream() << "Failed to save game: " << e.what(); logGlobal->error("Failed to save game: %s", e.what());
} }
} }
void CGameHandler::close() void CGameHandler::close()
{ {
logGlobal->infoStream() << "We have been requested to close."; logGlobal->info("We have been requested to close.");
if(gs->initialOpts->mode == StartInfo::DUEL) if(gs->initialOpts->mode == StartInfo::DUEL)
{ {
@@ -3604,7 +3596,7 @@ bool CGameHandler::queryReply(QueryID qid, ui32 answer, PlayerColor player)
{ {
boost::unique_lock<boost::recursive_mutex> lock(gsm); boost::unique_lock<boost::recursive_mutex> lock(gsm);
logGlobal->traceStream() << boost::format("Player %s attempts answering query %d with answer %d") % player % qid % answer; logGlobal->trace("Player %s attempts answering query %d with answer %d", player, qid, answer);
auto topQuery = queries.topQuery(player); auto topQuery = queries.topQuery(player);
COMPLAIN_RET_FALSE_IF(!topQuery, "This player doesn't have any queries!"); COMPLAIN_RET_FALSE_IF(!topQuery, "This player doesn't have any queries!");
@@ -3663,10 +3655,10 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
: nullptr; : nullptr;
const bool isAboutActiveStack = stack && (stack == battleActiveStack()); const bool isAboutActiveStack = stack && (stack == battleActiveStack());
logGlobal->traceStream() << boost::format( logGlobal->trace(
"Making action: type=%d; side=%d; stack=%s; dst=%s; additionalInfo=%d; stackAtDst=%s") "Making action: type=%d; side=%d; stack=%s; dst=%s; additionalInfo=%d; stackAtDst=%s",
% ba.actionType % (int)ba.side % (stack ? stack->getName() : std::string("none")) ba.actionType, (int)ba.side, (stack ? stack->getName() : std::string("none")),
% ba.destinationTile % ba.additionalInfo % (destinationStack ? destinationStack->getName() : std::string("none")); ba.destinationTile, ba.additionalInfo, (destinationStack ? destinationStack->getName() : std::string("none")));
switch(ba.actionType) switch(ba.actionType)
{ {
@@ -3785,7 +3777,7 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
BattleHex startingPos = stack->position; BattleHex startingPos = stack->position;
int distance = moveStack(ba.stackNumber, ba.destinationTile); int distance = moveStack(ba.stackNumber, ba.destinationTile);
logGlobal->traceStream() << stack->nodeName() << " will attack " << destinationStack->nodeName(); logGlobal->trace("%s will attack %s", stack->nodeName(), destinationStack->nodeName());
if(stack->position != ba.destinationTile //we wasn't able to reach destination tile if(stack->position != ba.destinationTile //we wasn't able to reach destination tile
&& !(stack->doubleWide() && !(stack->doubleWide()
@@ -3793,9 +3785,7 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
) //nor occupy specified hex ) //nor occupy specified hex
) )
{ {
std::string problem = "We cannot move this stack to its destination " + stack->getCreature()->namePl; complain("We cannot move this stack to its destination " + stack->getCreature()->namePl);
logGlobal->warnStream() << problem;
complain(problem);
ok = false; ok = false;
sendAndApply(&end_action); sendAndApply(&end_action);
break; break;
@@ -4024,8 +4014,7 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
// attacked tile may have changed - update destination // attacked tile may have changed - update destination
attack.destinationTile = gs->curB->wallPartToBattleHex(EWallPart::EWallPart(attack.attackedPart)); attack.destinationTile = gs->curB->wallPartToBattleHex(EWallPart::EWallPart(attack.attackedPart));
logGlobal->traceStream() << "Catapult attacks " << (int)attack.attackedPart logGlobal->trace("Catapult attacks %d dealing %d damage", (int)attack.attackedPart, (int)attack.damageDealt);
<< " dealing " << (int)attack.damageDealt << " damage";
//removing creatures in turrets / keep if one is destroyed //removing creatures in turrets / keep if one is destroyed
if(attack.damageDealt > 0 && (attackedPart == EWallPart::KEEP || if(attack.damageDealt > 0 && (attackedPart == EWallPart::KEEP ||
@@ -4367,16 +4356,12 @@ bool CGameHandler::makeCustomAction( BattleAction &ba )
{ {
COMPLAIN_RET_FALSE_IF(ba.side > 1, "Side must be 0 or 1!"); COMPLAIN_RET_FALSE_IF(ba.side > 1, "Side must be 0 or 1!");
const CGHeroInstance *h = gs->curB->battleGetFightingHero(ba.side); const CGHeroInstance *h = gs->curB->battleGetFightingHero(ba.side);
if(!h) COMPLAIN_RET_FALSE_IF((!h), "Wrong caster!");
if(ba.additionalInfo < 0 || ba.additionalInfo >= VLC->spellh->objects.size())
{ {
logGlobal->warnStream() << "Wrong caster!"; logGlobal->error("Wrong spell id (%d)!", ba.additionalInfo);
return false;
}
if(ba.additionalInfo >= VLC->spellh->objects.size())
{
logGlobal->warnStream() << "Wrong spell id (" << ba.additionalInfo << ")!";
return false; return false;
} }
@@ -4390,8 +4375,7 @@ bool CGameHandler::makeCustomAction( BattleAction &ba )
ESpellCastProblem::ESpellCastProblem escp = gs->curB->battleCanCastThisSpell(h, s, ECastingMode::HERO_CASTING);//todo: should we check aimed cast(battleCanCastThisSpellHere)? ESpellCastProblem::ESpellCastProblem escp = gs->curB->battleCanCastThisSpell(h, s, ECastingMode::HERO_CASTING);//todo: should we check aimed cast(battleCanCastThisSpellHere)?
if(escp != ESpellCastProblem::OK) if(escp != ESpellCastProblem::OK)
{ {
logGlobal->warnStream() << "Spell cannot be cast!"; logGlobal->warn("Spell cannot be cast! Problem: %d", escp);
logGlobal->warnStream() << "Problem : " << escp;
return false; return false;
} }
@@ -4806,7 +4790,7 @@ void CGameHandler::handleTownEvents(CGTownInstance * town, NewTurn &n)
bool CGameHandler::complain( const std::string &problem ) bool CGameHandler::complain( const std::string &problem )
{ {
sendMessageToAll("Server encountered a problem: " + problem); sendMessageToAll("Server encountered a problem: " + problem);
logGlobal->errorStream() << problem; logGlobal->error(problem);
return true; return true;
} }
@@ -4889,7 +4873,7 @@ bool CGameHandler::isAllowedExchange( ObjectInstanceID id1, ObjectInstanceID id2
void CGameHandler::objectVisited( const CGObjectInstance * obj, const CGHeroInstance * h ) void CGameHandler::objectVisited( const CGObjectInstance * obj, const CGHeroInstance * h )
{ {
logGlobal->debugStream() << h->nodeName() << " visits " << obj->getObjectName() << "(" << obj->ID << ":" << obj->subID << ")"; logGlobal->debug("%s visits %s (%d:%d)", h->nodeName(), obj->getObjectName(), obj->ID, obj->subID);
auto visitQuery = std::make_shared<CObjectVisitQuery>(obj, h, obj->visitablePos()); auto visitQuery = std::make_shared<CObjectVisitQuery>(obj, h, obj->visitablePos());
queries.addQuery(visitQuery); //TODO real visit pos queries.addQuery(visitQuery); //TODO real visit pos
@@ -4907,7 +4891,7 @@ void CGameHandler::objectVisited( const CGObjectInstance * obj, const CGHeroInst
void CGameHandler::objectVisitEnded(const CObjectVisitQuery &query) void CGameHandler::objectVisitEnded(const CObjectVisitQuery &query)
{ {
logGlobal->traceStream() << query.visitingHero->nodeName() << " visit ends.\n"; logGlobal->debug("%s visit ends.\n", query.visitingHero->nodeName());
HeroVisit hv; HeroVisit hv;
hv.player = query.players.front(); hv.player = query.players.front();
@@ -5761,7 +5745,7 @@ void CGameHandler::runBattle()
} }
else else
{ {
logGlobal->traceStream() << "Activating " << next->nodeName(); logGlobal->trace("Activating %s", next->nodeName());
auto nextId = next->ID; auto nextId = next->ID;
BattleSetActiveStack sas; BattleSetActiveStack sas;
sas.stack = nextId; sas.stack = nextId;
@@ -5936,12 +5920,12 @@ void CGameHandler::spawnWanderingMonsters(CreatureID creatureID)
getFreeTiles(tiles); getFreeTiles(tiles);
ui32 amount = tiles.size() / 200; //Chance is 0.5% for each tile ui32 amount = tiles.size() / 200; //Chance is 0.5% for each tile
std::random_shuffle(tiles.begin(), tiles.end()); std::random_shuffle(tiles.begin(), tiles.end());
logGlobal->traceStream() << "Spawning wandering monsters. Found " << tiles.size() << " free tiles. Creature type: " << creatureID; logGlobal->trace("Spawning wandering monsters. Found %d free tiles. Creature type: %d", tiles.size(), creatureID.num);
const CCreature *cre = VLC->creh->creatures.at(creatureID); const CCreature *cre = VLC->creh->creatures.at(creatureID);
for (int i = 0; i < amount; ++i) for (int i = 0; i < amount; ++i)
{ {
tile = tiles.begin(); tile = tiles.begin();
logGlobal->traceStream() << "\tSpawning monster at " << *tile; logGlobal->trace("\tSpawning monster at %s",(*tile)());
putNewMonster(creatureID, cre->getRandomAmount(std::rand), *tile); putNewMonster(creatureID, cre->getRandomAmount(std::rand), *tile);
tiles.erase(tile); //not use it again tiles.erase(tile); //not use it again
} }
@@ -6049,16 +6033,15 @@ void CGameHandler::duelFinished()
auto getName = [&](int i){ return si->getIthPlayersSettings(gs->curB->sides.at(i).color).name; }; auto getName = [&](int i){ return si->getIthPlayersSettings(gs->curB->sides.at(i).color).name; };
int casualtiesPoints = 0; int casualtiesPoints = 0;
logGlobal->debugStream() << boost::format("Winner side %d\nWinner casualties:") logGlobal->debug("Winner side %d\nWinner casualties:", (int)battleResult.data->winner);
% (int)battleResult.data->winner;
for(auto & elem : battleResult.data->casualties[battleResult.data->winner]) for(auto & elem : battleResult.data->casualties[battleResult.data->winner])
{ {
const CCreature *c = VLC->creh->creatures[elem.first]; const CCreature *c = VLC->creh->creatures[elem.first];
logGlobal->debugStream() << boost::format("\t* %d of %s") % elem.second % c->namePl; logGlobal->debug("\t* %d of %s", elem.second, c->namePl);
casualtiesPoints += c->AIValue * elem.second; casualtiesPoints += c->AIValue * elem.second;
} }
logGlobal->debugStream() << boost::format("Total casualties points: %d") % casualtiesPoints; logGlobal->debug("Total casualties points: %d", casualtiesPoints);
time_t timeNow; time_t timeNow;
@@ -6073,7 +6056,7 @@ void CGameHandler::duelFinished()
} }
else else
{ {
logGlobal->errorStream() << "Cannot open to write " << cmdLineOptions["resultsFile"].as<std::string>(); logGlobal->error("Cannot open to write %s", cmdLineOptions["resultsFile"].as<std::string>());
} }
CSaveFile resultFile("result.vdrst"); CSaveFile resultFile("result.vdrst");
@@ -6102,7 +6085,7 @@ CasualtiesAfterBattle::CasualtiesAfterBattle(const CArmedInstance * _army, Battl
if (st->owner != color) //remove only our stacks if (st->owner != color) //remove only our stacks
continue; continue;
logGlobal->debugStream() << "Calculating casualties for " << st->nodeName(); logGlobal->debug("Calculating casualties for %s", st->nodeName());
//FIXME: this info is also used in BattleInfo::calculateCasualties, refactor //FIXME: this info is also used in BattleInfo::calculateCasualties, refactor
st->count = std::max (0, st->count - st->resurrected); st->count = std::max (0, st->count - st->resurrected);
@@ -6117,9 +6100,7 @@ CasualtiesAfterBattle::CasualtiesAfterBattle(const CArmedInstance * _army, Battl
auto warMachine = VLC->arth->creatureToMachineID(st->type->idNumber); auto warMachine = VLC->arth->creatureToMachineID(st->type->idNumber);
if(warMachine == ArtifactID::NONE) if(warMachine == ArtifactID::NONE)
{ logGlobal->error("Invalid creature in war machine virtual slot. Stack: %s", st->nodeName());
logGlobal->errorStream() << "Invalid creature in war machine virtual slot: " << st->nodeName();
}
//catapult artifact remain even if "creature" killed in siege //catapult artifact remain even if "creature" killed in siege
else if(warMachine != ArtifactID::CATAPULT && !st->count) else if(warMachine != ArtifactID::CATAPULT && !st->count)
{ {
@@ -6135,7 +6116,7 @@ CasualtiesAfterBattle::CasualtiesAfterBattle(const CArmedInstance * _army, Battl
{ {
if(st->alive() && st->count > 0) if(st->alive() && st->count > 0)
{ {
logGlobal->debugStream() << "Permanently summoned " << st->count << " units."; logGlobal->debug("Permanently summoned %d units.", st->count);
const CreatureID summonedType = st->type->idNumber; const CreatureID summonedType = st->type->idNumber;
summoned[summonedType] += st->count; summoned[summonedType] += st->count;
} }
@@ -6144,7 +6125,7 @@ CasualtiesAfterBattle::CasualtiesAfterBattle(const CArmedInstance * _army, Battl
{ {
if(nullptr == st->base) if(nullptr == st->base)
{ {
logGlobal->error("Stack with no base in commander slot."); logGlobal->error("Stack with no base in commander slot. Stack: %s", st->nodeName());
} }
else else
{ {
@@ -6159,7 +6140,7 @@ CasualtiesAfterBattle::CasualtiesAfterBattle(const CArmedInstance * _army, Battl
} }
} }
else else
logGlobal->error("Stack with invalid instance in commander slot."); logGlobal->error("Stack with invalid instance in commander slot. Stack: %s", st->nodeName());
} }
} }
else if(st->base && !army->slotEmpty(st->slot)) else if(st->base && !army->slotEmpty(st->slot))
@@ -6172,14 +6153,14 @@ CasualtiesAfterBattle::CasualtiesAfterBattle(const CArmedInstance * _army, Battl
} }
else if(st->count < army->getStackCount(st->slot)) else if(st->count < army->getStackCount(st->slot))
{ {
logGlobal->debugStream() << "Stack lost " << (army->getStackCount(st->slot) - st->count) << " units."; logGlobal->debug("Stack lost %d units.", army->getStackCount(st->slot) - st->count);
StackLocation sl(army, st->slot); StackLocation sl(army, st->slot);
newStackCounts.push_back(TStackAndItsNewCount(sl, st->count)); newStackCounts.push_back(TStackAndItsNewCount(sl, st->count));
} }
} }
else else
{ {
logGlobal->warnStream() << "Unable to process stack: " << st->nodeName(); logGlobal->warn("Unable to process stack: %s", st->nodeName());
} }
} }
} }

18
server/CQuery.cpp
View File

@@ -41,13 +41,13 @@ CQuery::CQuery(void)
static QueryID QID = QueryID(0); static QueryID QID = QueryID(0);
queryID = ++QID; queryID = ++QID;
logGlobal->traceStream() << "Created a new query with id " << queryID; logGlobal->trace("Created a new query with id %d", queryID);
} }
CQuery::~CQuery(void) CQuery::~CQuery(void)
{ {
logGlobal->traceStream() << "Destructed the query with id " << queryID; logGlobal->trace("Destructed the query with id %d", queryID);
} }
void CQuery::addPlayer(PlayerColor color) void CQuery::addPlayer(PlayerColor color)
@@ -129,7 +129,7 @@ void Queries::popQuery(PlayerColor player, QueryPtr query)
LOG_TRACE_PARAMS(logGlobal, "player='%s', query='%s'", player % query); LOG_TRACE_PARAMS(logGlobal, "player='%s', query='%s'", player % query);
if(topQuery(player) != query) if(topQuery(player) != query)
{ {
logGlobal->traceStream() << "Cannot remove, not a top!"; logGlobal->trace("Cannot remove, not a top!");
return; return;
} }
@@ -156,7 +156,7 @@ void Queries::popQuery(const CQuery &query)
if(top.get() == &query) if(top.get() == &query)
popQuery(top); popQuery(top);
else else
logGlobal->traceStream() << "Cannot remove query " << query; logGlobal->trace("Cannot remove query %s", query.toString());
} }
} }
@@ -174,7 +174,7 @@ void Queries::addQuery(QueryPtr query)
void Queries::addQuery(PlayerColor player, QueryPtr query) void Queries::addQuery(PlayerColor player, QueryPtr query)
{ {
LOG_TRACE_PARAMS(logGlobal, "player='%s', query='%s'", player % query); LOG_TRACE_PARAMS(logGlobal, "player='%d', query='%s'", player.getNum() % query);
query->onAdding(gh, player); query->onAdding(gh, player);
queries[player].push_back(query); queries[player].push_back(query);
} }
@@ -188,7 +188,7 @@ void Queries::popIfTop(QueryPtr query)
{ {
LOG_TRACE_PARAMS(logGlobal, "query='%d'", query); LOG_TRACE_PARAMS(logGlobal, "query='%d'", query);
if(!query) if(!query)
logGlobal->errorStream() << "The query is nullptr! Ignoring."; logGlobal->error("The query is nullptr! Ignoring.");
popIfTop(*query); popIfTop(*query);
} }
@@ -341,7 +341,7 @@ CHeroLevelUpDialogQuery::CHeroLevelUpDialogQuery(const HeroLevelUp &Hlu)
void CHeroLevelUpDialogQuery::onRemoval(CGameHandler *gh, PlayerColor color) void CHeroLevelUpDialogQuery::onRemoval(CGameHandler *gh, PlayerColor color)
{ {
assert(answer); assert(answer);
logGlobal->traceStream() << "Completing hero level-up query. " << hlu.hero->getObjectName() << " gains skill " << *answer; logGlobal->trace("Completing hero level-up query. %s gains skill %d", hlu.hero->getObjectName(), answer.get());
gh->levelUpHero(hlu.hero, hlu.skills[*answer]); gh->levelUpHero(hlu.hero, hlu.skills[*answer]);
} }
@@ -359,7 +359,7 @@ CCommanderLevelUpDialogQuery::CCommanderLevelUpDialogQuery(const CommanderLevelU
void CCommanderLevelUpDialogQuery::onRemoval(CGameHandler *gh, PlayerColor color) void CCommanderLevelUpDialogQuery::onRemoval(CGameHandler *gh, PlayerColor color)
{ {
assert(answer); assert(answer);
logGlobal->traceStream() << "Completing commander level-up query. Commander of hero " << clu.hero->getObjectName() << " gains skill " << *answer; logGlobal->trace("Completing commander level-up query. Commander of hero %s gains skill %s", clu.hero->getObjectName(), answer.get());
gh->levelUpCommander(clu.hero->commander, clu.skills[*answer]); gh->levelUpCommander(clu.hero->commander, clu.skills[*answer]);
} }
@@ -397,7 +397,7 @@ void CHeroMovementQuery::onExposure(CGameHandler *gh, QueryPtr topQuery)
if(visitDestAfterVictory && hero->tempOwner == players[0]) //hero still alive, so he won with the guard if(visitDestAfterVictory && hero->tempOwner == players[0]) //hero still alive, so he won with the guard
//TODO what if there were H4-like escape? we should also check pos //TODO what if there were H4-like escape? we should also check pos
{ {
logGlobal->traceStream() << "Hero " << hero->name << " after victory over guard finishes visit to " << tmh.end; logGlobal->trace("Hero %s after victory over guard finishes visit to %s", hero->name, tmh.end());
//finish movement //finish movement
visitDestAfterVictory = false; visitDestAfterVictory = false;
gh->visitObjectOnTile(*gh->getTile(CGHeroInstance::convertPosition(tmh.end, false)), hero); gh->visitObjectOnTile(*gh->getTile(CGHeroInstance::convertPosition(tmh.end, false)), hero);

57
server/CVCMIServer.cpp
View File

@@ -124,7 +124,7 @@ void CPregameServer::handleConnection(CConnection *cpc)
if(connections.empty()) if(connections.empty())
{ {
logNetwork->errorStream() << "Last connection lost, server will close itself..."; logNetwork->error("Last connection lost, server will close itself...");
boost::this_thread::sleep(boost::posix_time::seconds(2)); //we should never be hasty when networking boost::this_thread::sleep(boost::posix_time::seconds(2)); //we should never be hasty when networking
state = ENDING_WITHOUT_START; state = ENDING_WITHOUT_START;
} }
@@ -158,7 +158,7 @@ void CPregameServer::run()
if(state != RUNNING) if(state != RUNNING)
{ {
logNetwork->infoStream() << "Stopping listening for connections..."; logNetwork->info("Stopping listening for connections...");
acceptor->close(); acceptor->close();
} }
@@ -172,13 +172,13 @@ void CPregameServer::run()
boost::this_thread::sleep(boost::posix_time::milliseconds(50)); boost::this_thread::sleep(boost::posix_time::milliseconds(50));
} }
logNetwork->infoStream() << "Thread handling connections ended"; logNetwork->info("Thread handling connections ended");
if(state == ENDING_AND_STARTING_GAME) if(state == ENDING_AND_STARTING_GAME)
{ {
logNetwork->infoStream() << "Waiting for listening thread to finish..."; logNetwork->info("Waiting for listening thread to finish...");
while(listeningThreads) boost::this_thread::sleep(boost::posix_time::milliseconds(50)); while(listeningThreads) boost::this_thread::sleep(boost::posix_time::milliseconds(50));
logNetwork->infoStream() << "Preparing new game"; logNetwork->info("Preparing new game");
} }
} }
@@ -199,11 +199,11 @@ void CPregameServer::connectionAccepted(const boost::system::error_code& ec)
{ {
if(ec) if(ec)
{ {
logNetwork->infoStream() << "Something wrong during accepting: " << ec.message(); logNetwork->info("Something wrong during accepting: %s", ec.message());
return; return;
} }
logNetwork->infoStream() << "We got a new connection! :)"; logNetwork->info("We got a new connection! :)");
CConnection *pc = new CConnection(upcomingConnection, NAME); CConnection *pc = new CConnection(upcomingConnection, NAME);
initConnection(pc); initConnection(pc);
upcomingConnection = nullptr; upcomingConnection = nullptr;
@@ -232,7 +232,7 @@ void CPregameServer::start_async_accept()
void CPregameServer::announceTxt(const std::string &txt, const std::string &playerName /*= "system"*/) void CPregameServer::announceTxt(const std::string &txt, const std::string &playerName /*= "system"*/)
{ {
logNetwork->infoStream() << playerName << " says: " << txt; logNetwork->info("%s says: %s", playerName, txt);
ChatMessage cm; ChatMessage cm;
cm.playerName = playerName; cm.playerName = playerName;
cm.message = txt; cm.message = txt;
@@ -300,7 +300,7 @@ void CPregameServer::initConnection(CConnection *c)
{ {
*c >> c->name; *c >> c->name;
connections.insert(c); connections.insert(c);
logNetwork->infoStream() << "Pregame connection with player " << c->name << " established!"; logNetwork->info("Pregame connection with player %s established!", c->name);
} }
void CPregameServer::startListeningThread(CConnection * pc) void CPregameServer::startListeningThread(CConnection * pc)
@@ -313,7 +313,7 @@ void CPregameServer::startListeningThread(CConnection * pc)
CVCMIServer::CVCMIServer() CVCMIServer::CVCMIServer()
: io(new boost::asio::io_service()), acceptor(new TAcceptor(*io, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port))), firstConnection(nullptr) : io(new boost::asio::io_service()), acceptor(new TAcceptor(*io, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port))), firstConnection(nullptr)
{ {
logNetwork->debugStream() << "CVCMIServer created!"; logNetwork->trace("CVCMIServer created!");
} }
CVCMIServer::~CVCMIServer() CVCMIServer::~CVCMIServer()
{ {
@@ -410,7 +410,7 @@ void CVCMIServer::start()
#endif #endif
boost::system::error_code error; boost::system::error_code error;
logNetwork->infoStream()<<"Listening for connections at port " << acceptor->local_endpoint().port(); logNetwork->info("Listening for connections at port %d", acceptor->local_endpoint().port());
auto s = new boost::asio::ip::tcp::socket(acceptor->get_io_service()); auto s = new boost::asio::ip::tcp::socket(acceptor->get_io_service());
boost::thread acc(std::bind(vaccept,acceptor,s,&error)); boost::thread acc(std::bind(vaccept,acceptor,s,&error));
#ifndef VCMI_ANDROID #ifndef VCMI_ANDROID
@@ -424,9 +424,9 @@ void CVCMIServer::start()
logNetwork->warnStream()<<"Got connection but there is an error " << error; logNetwork->warnStream()<<"Got connection but there is an error " << error;
return; return;
} }
logNetwork->infoStream()<<"We've accepted someone... "; logNetwork->info("We've accepted someone... ");
firstConnection = new CConnection(s,NAME); firstConnection = new CConnection(s,NAME);
logNetwork->infoStream()<<"Got connection!"; logNetwork->info("Got connection!");
while(!end2) while(!end2)
{ {
ui8 mode; ui8 mode;
@@ -462,23 +462,6 @@ void CVCMIServer::loadGame()
c >> clients >> fname; //how many clients should be connected c >> clients >> fname; //how many clients should be connected
// {
// char sig[8];
// CMapHeader dum;
// StartInfo *si;
//
// CLoadFile lf(CResourceHandler::get("local")->getResourceName(ResourceID(fname, EResType::LIB_SAVEGAME)));
// lf >> sig >> dum >> si;
// logNetwork->infoStream() <<"Reading save signature";
//
// lf >> *VLC;
// logNetwork->infoStream() <<"Reading handlers";
//
// lf >> (gh.gs);
// c.addStdVecItems(gh.gs);
// logNetwork->infoStream() <<"Reading gamestate";
// }
{ {
CLoadFile lf(*CResourceHandler::get("local")->getResourceName(ResourceID(fname, EResType::SERVER_SAVEGAME)), minSupportedVersion); CLoadFile lf(*CResourceHandler::get("local")->getResourceName(ResourceID(fname, EResType::SERVER_SAVEGAME)), minSupportedVersion);
gh.loadCommonState(lf); gh.loadCommonState(lf);
@@ -500,7 +483,7 @@ void CVCMIServer::loadGame()
acceptor->accept(*s,error); acceptor->accept(*s,error);
if(error) //retry if(error) //retry
{ {
logNetwork->warnStream()<<"Cannot establish connection - retrying..."; logNetwork->warn("Cannot establish connection - retrying...");
i--; i--;
continue; continue;
} }
@@ -564,17 +547,17 @@ void handleLinuxSignal(int sig)
int ptrCount = backtrace(buffer, STACKTRACE_SIZE); int ptrCount = backtrace(buffer, STACKTRACE_SIZE);
char ** strings; char ** strings;
logGlobal->errorStream() << "Error: signal " << sig << ":"; logGlobal->error("Error: signal %d :", sig);
strings = backtrace_symbols(buffer, ptrCount); strings = backtrace_symbols(buffer, ptrCount);
if(strings == nullptr) if(strings == nullptr)
{ {
logGlobal->errorStream() << "There are no symbols."; logGlobal->error("There are no symbols.");
} }
else else
{ {
for(int i = 0; i < ptrCount; ++i) for(int i = 0; i < ptrCount; ++i)
{ {
logGlobal->errorStream() << strings[i]; logGlobal->error(strings[i]);
} }
free(strings); free(strings);
} }
@@ -597,7 +580,7 @@ int main(int argc, char** argv)
handleCommandOptions(argc, argv); handleCommandOptions(argc, argv);
port = cmdLineOptions["port"].as<int>(); port = cmdLineOptions["port"].as<int>();
logNetwork->infoStream() << "Port " << port << " will be used."; logNetwork->info("Port %d will be used.", port);
preinitDLL(console); preinitDLL(console);
settings.init(); settings.init();
@@ -620,7 +603,7 @@ int main(int argc, char** argv)
} }
catch(boost::system::system_error &e) //for boost errors just log, not crash - probably client shut down connection catch(boost::system::system_error &e) //for boost errors just log, not crash - probably client shut down connection
{ {
logNetwork->errorStream() << e.what(); logNetwork->error(e.what());
end2 = true; end2 = true;
} }
catch(...) catch(...)
@@ -630,7 +613,7 @@ int main(int argc, char** argv)
} }
catch(boost::system::system_error &e) catch(boost::system::system_error &e)
{ {
logNetwork->errorStream() << e.what(); logNetwork->error(e.what());
//catch any startup errors (e.g. can't access port) errors //catch any startup errors (e.g. can't access port) errors
//and return non-zero status so client can detect error //and return non-zero status so client can detect error
throw; throw;

6
server/NetPacksServer.cpp
View File

@@ -16,12 +16,12 @@
boost::unique_lock<boost::mutex> lock(*c->wmx); \ boost::unique_lock<boost::mutex> lock(*c->wmx); \
*c << &temp_message; \ *c << &temp_message; \
} \ } \
logNetwork->errorStream()<<"Player is not allowed to perform this action!"; \ logNetwork->error("Player is not allowed to perform this action!"); \
return false;} while(0) return false;} while(0)
#define WRONG_PLAYER_MSG(expectedplayer) do {std::ostringstream oss;\ #define WRONG_PLAYER_MSG(expectedplayer) do {std::ostringstream oss;\
oss << "You were identified as player " << gh->getPlayerAt(c) << " while expecting " << expectedplayer;\ oss << "You were identified as player " << gh->getPlayerAt(c) << " while expecting " << expectedplayer;\
logNetwork->errorStream() << oss.str(); \ logNetwork->error(oss.str()); \
if(c) { SystemMessage temp_message(oss.str()); boost::unique_lock<boost::mutex> lock(*c->wmx); *c << &temp_message; } } while(0) if(c) { SystemMessage temp_message(oss.str()); boost::unique_lock<boost::mutex> lock(*c->wmx); *c << &temp_message; } } while(0)
#define ERROR_IF_NOT_OWNS(id) do{if(!PLAYER_OWNS(id)){WRONG_PLAYER_MSG(gh->getOwner(id)); ERROR_AND_RETURN; }}while(0) #define ERROR_IF_NOT_OWNS(id) do{if(!PLAYER_OWNS(id)){WRONG_PLAYER_MSG(gh->getOwner(id)); ERROR_AND_RETURN; }}while(0)
@@ -47,7 +47,7 @@ CGameState* CPackForServer::GS(CGameHandler *gh)
bool SaveGame::applyGh( CGameHandler *gh ) bool SaveGame::applyGh( CGameHandler *gh )
{ {
gh->save(fname); gh->save(fname);
logGlobal->infoStream() << "Game has been saved as " + fname; logGlobal->info("Game has been saved as %s", fname);
return true; return true;
} }