Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Compatibility with new SDK #36

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Compatibility with new SDK #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions aws_ros1_common/include/aws_ros1_common/sdk_utils/logging/aws_ros_logger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class AWSROSLogger : public AWSLogSystem
AWSROSLogger(AWSROSLogger const &) = delete; // Do not allow copy constructor
AWSROSLogger & operator=(AWSROSLogger const &) = delete; // Do not allow assignment operator
~AWSROSLogger() override = default;
virtual void Flush();

protected:
void LogTrace(const char * tag, const std::string & message) override;
Expand Down
2 changes: 2 additions & 0 deletions aws_ros1_common/src/sdk_utils/logging/aws_ros_logger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ namespace Logging {

AWSROSLogger::AWSROSLogger(Aws::Utils::Logging::LogLevel log_level) : AWSLogSystem(log_level) {}

void AWSROSLogger::Flush() {}

void AWSROSLogger::LogTrace(const char * tag, const std::string & message)
{
ROS_DEBUG("[%s] %s", tag, message.c_str());
Expand Down
6 changes: 3 additions & 3 deletions aws_ros1_common/test/client_configuration_provider_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void InitializeNodeAndConfig(ros::NodeHandle & node, Aws::Client::ClientConfigur
node.setParam(CLIENT_CONFIG_PREFIX "/verify_SSL", true);
config.verifySSL = true;
node.setParam(CLIENT_CONFIG_PREFIX "/follow_redirects", true);
config.followRedirects = true;
config.followRedirects = Aws::Client::FollowRedirectsPolicy::ALWAYS;
}

/**
Expand All @@ -56,10 +56,10 @@ TEST(DefaultClientConfigurationProvider, getClientConfiguration)
generated_config
.userAgent; /* Set the user agent to w/e was generated. Will be tested separately */

prepared_config.followRedirects = false;
prepared_config.followRedirects = Aws::Client::FollowRedirectsPolicy::NEVER;
ASSERT_NE(prepared_config, generated_config);

prepared_config.followRedirects = true;
prepared_config.followRedirects = Aws::Client::FollowRedirectsPolicy::ALWAYS;
ASSERT_EQ(prepared_config, generated_config);
}

Expand Down