Skip to content
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.

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

Spelling fixes and additional call stat reporting #798

Merged
merged 1 commit into from
Apr 24, 2023
Merged
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions trunk-recorder/call_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ void Call_impl::conclude_call() {
if (!recorder) {
BOOST_LOG_TRIVIAL(error) << "Call_impl::end_call() State is recording, but no recorder assigned!";
}
BOOST_LOG_TRIVIAL(info) << "[" << sys->get_short_name() << "]\t\033[0;34m" << this->get_call_num() << "C\033[0m\tTG: " << this->get_talkgroup_display() << "\tFreq: " << format_freq(get_freq()) << "\t\u001b[33mConcluding Recorded Call\u001b[0m - Last Update: " << this->since_last_update() << "s\tCall_impl Elapsed: " << this->elapsed();
BOOST_LOG_TRIVIAL(info) << "[" << sys->get_short_name() << "]\t\033[0;34m" << this->get_call_num() << "C\033[0m\tTG: " << this->get_talkgroup_display() << "\tFreq: " << format_freq(get_freq()) << "\t\u001b[33mConcluding Recorded Call\u001b[0m - Last Update: " << this->since_last_update() << "s\tCall Elapsed: " << this->elapsed();

this->get_recorder()->stop();
transmission_list = this->get_recorder()->get_transmission_list();
Expand Down Expand Up @@ -417,17 +417,19 @@ boost::property_tree::ptree Call_impl::get_stats() {
boost::property_tree::ptree freq_list_node;
boost::property_tree::ptree source_list_node;
call_node.put("id", boost::lexical_cast<std::string>(this->get_sys_num()) + "_" + boost::lexical_cast<std::string>(this->get_talkgroup()) + "_" + boost::lexical_cast<std::string>(this->get_start_time()));
call_node.put("callNum", this->get_call_num());
call_node.put("freq", this->get_freq());
call_node.put("sysNum", this->get_sys_num());
call_node.put("shortName", this->get_short_name());
call_node.put("talkgroup", this->get_talkgroup());
call_node.put("talkgrouptag", this->get_talkgroup_tag());
call_node.put("elasped", this->elapsed());
call_node.put("elapsed", this->elapsed());
if (get_state() == RECORDING)
call_node.put("length", this->get_current_length());
else
call_node.put("length", this->get_final_length());
call_node.put("state", this->get_state());
call_node.put("monState", this->get_monitoring_state());
call_node.put("phase2", this->get_phase2_tdma());
call_node.put("conventional", this->is_conventional());
call_node.put("encrypted", this->get_encrypted());
Expand Down