Skip to content

Fix report limit termination off by one error #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 16, 2020
Merged

Fix report limit termination off by one error #598

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee6d931
Fix report limit termination off by one error
Sep 9, 2020
f08e043
Exceed to reached
Sep 9, 2020
d32b04b
Fail safe
Sep 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions subt_ign/src/GameLogicPlugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,6 +1385,8 @@ bool GameLogicPluginPrivate::OnNewArtifact(const subt::msgs::Artifact &_req,
<< " time_sec: " << this->simTime.sec() << "\n"
<< " total_score: " << this->totalScore << std::endl;
this->LogEvent(stream.str());
this->Finish();
return true;
}
else if (!this->ArtifactFromInt(_req.type(), artifactType))
{
Expand Down Expand Up @@ -1432,11 +1434,20 @@ bool GameLogicPluginPrivate::OnNewArtifact(const subt::msgs::Artifact &_req,
return true;
}

if (!this->finished && this->reportCount > this->reportCountLimit)
if (!this->finished && this->reportCount >= this->reportCountLimit)
{
_resp.set_report_status("report limit exceeded");
this->Log() << "report_limit_exceeded" << std::endl;
ignmsg << "Report limit exceed." << std::endl;
_resp.set_report_status("report limit reached");
this->Log() << "report_limit_reached" << std::endl;
ignmsg << "Report limit reached." << std::endl;

std::ostringstream stream;
stream
<< "- event:\n"
<< " type: artifact_report_limit_reached\n"
<< " time_sec: " << this->simTime.sec() << "\n"
<< " total_score: " << this->totalScore << std::endl;
this->LogEvent(stream.str());

this->Finish();
return true;
}
Expand Down