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.

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

Jump to bottom

Fix/fix log severity level in on vehicle data notification cc #2776

Merged
merged 6 commits into from
Oct 28, 2019
Merged

Fix/fix log severity level in on vehicle data notification cc #2776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d5b3c4
Fix log severity level in on_vehicle_data_notification.cc
SKobziev Oct 17, 2018
072bba7
Fix log severity level and various typos
SKobziev Oct 25, 2018
928e5ba
Merge remote-tracking branch 'origin/release/6.0.0' into fix/Fix_log_…
Jack-Byrne Oct 28, 2019
791c62d
Resolve merge conflict
Jack-Byrne Oct 28, 2019
8a3b976
Fix Connection Typo
Jack-Byrne Oct 28, 2019
ed23441
Revert disabled unit test
Jack-Byrne Oct 28, 2019
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
2 changes: 1 addition & 1 deletion src/components/application_manager/include/application_manager/request_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ struct RequestInfo {
}
uint64_t hash();
static uint64_t GenerateHash(uint32_t var1, uint32_t var2);
static uint32_t HmiConnectoinKey;
static uint32_t HmiConnectionKey;

protected:
RequestPtr request_;
Expand Down
4 changes: 2 additions & 2 deletions src/components/application_manager/src/commands/request_from_hmi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ void RequestFromHMI::SendProviderRequest(
if (hmi_destination) {
LOG4CXX_DEBUG(logger_, "Sending Request to HMI Provider");
application_manager_.IncreaseForwardedRequestTimeout(
application_manager::request_controller::RequestInfo::HmiConnectoinKey,
application_manager::request_controller::RequestInfo::HmiConnectionKey,
correlation_id());
SendHMIRequest(hmi_function_id, &(*msg)[strings::msg_params], use_events);
return;
Expand All @@ -217,7 +217,7 @@ void RequestFromHMI::SendProviderRequest(

LOG4CXX_DEBUG(logger_, "Sending Request to Mobile Provider");
application_manager_.IncreaseForwardedRequestTimeout(
application_manager::request_controller::RequestInfo::HmiConnectoinKey,
application_manager::request_controller::RequestInfo::HmiConnectionKey,
correlation_id());
SendMobileRequest(
mobile_function_id, app, &(*msg)[strings::msg_params], use_events);
Expand Down
6 changes: 3 additions & 3 deletions src/components/application_manager/src/request_controller.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ void RequestController::OnMobileResponse(const uint32_t mobile_correlation_id,
void RequestController::OnHMIResponse(const uint32_t correlation_id,
const int32_t function_id) {
LOG4CXX_AUTO_TRACE(logger_);
TerminateRequest(correlation_id, RequestInfo::HmiConnectoinKey, function_id);
TerminateRequest(correlation_id, RequestInfo::HmiConnectionKey, function_id);
}

void RequestController::terminateWaitingForExecutionAppRequests(
Expand Down Expand Up @@ -339,7 +339,7 @@ void RequestController::terminateAppRequests(const uint32_t& app_id) {

void RequestController::terminateAllHMIRequests() {
LOG4CXX_AUTO_TRACE(logger_);
terminateWaitingForResponseAppRequests(RequestInfo::HmiConnectoinKey);
terminateWaitingForResponseAppRequests(RequestInfo::HmiConnectionKey);
}

void RequestController::terminateAllMobileRequests() {
Expand Down Expand Up @@ -448,7 +448,7 @@ void RequestController::TimeoutThread() {
const uint32_t experied_app_id = probably_expired->app_id();

probably_expired->request()->onTimeOut();
if (RequestInfo::HmiConnectoinKey == probably_expired->app_id()) {
if (RequestInfo::HmiConnectionKey == probably_expired->app_id()) {
LOG4CXX_DEBUG(logger_,
"Erase HMI request: " << probably_expired->requestId());
waiting_for_response_.RemoveRequest(probably_expired);
Expand Down
8 changes: 4 additions & 4 deletions src/components/application_manager/src/request_info.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@ namespace request_controller {

CREATE_LOGGERPTR_GLOBAL(logger_, "RequestController")

uint32_t RequestInfo::HmiConnectoinKey = 0;
uint32_t RequestInfo::HmiConnectionKey = 0;

HMIRequestInfo::HMIRequestInfo(RequestPtr request, const uint64_t timeout_msec)
: RequestInfo(request, HMIRequest, timeout_msec) {
correlation_id_ = request_->correlation_id();
app_id_ = RequestInfo::HmiConnectoinKey;
app_id_ = RequestInfo::HmiConnectionKey;
}

HMIRequestInfo::HMIRequestInfo(RequestPtr request,
const date_time::TimeDuration& start_time,
const uint64_t timeout_msec)
: RequestInfo(request, HMIRequest, start_time, timeout_msec) {
correlation_id_ = request_->correlation_id();
app_id_ = RequestInfo::HmiConnectoinKey;
app_id_ = RequestInfo::HmiConnectionKey;
}

MobileRequestInfo::MobileRequestInfo(RequestPtr request,
Expand Down Expand Up @@ -252,7 +252,7 @@ uint32_t RequestInfoSet::RemoveByConnectionKey(uint32_t connection_key) {
uint32_t RequestInfoSet::RemoveMobileRequests() {
LOG4CXX_AUTO_TRACE(logger_);
return RemoveRequests(AppIdCompararator(AppIdCompararator::NotEqual,
RequestInfo::HmiConnectoinKey));
RequestInfo::HmiConnectionKey));
}

const size_t RequestInfoSet::Size() {
Expand Down