Skip to content
This repository has been archived by the owner on Sep 13, 2024. It is now read-only.

add 'none' logging driver to ECS Agent's config #125

Merged
merged 1 commit into from
Oct 30, 2017

Conversation

aaithal
Copy link
Contributor

@aaithal aaithal commented Oct 30, 2017

Description

This commit modifies the ECS_AVAILABLE_LOGGING_DRIVERS env var
for the Agent to include none logging driver. This compliments
aws/amazon-ecs-agent#1041 PR in the
ECS Agent repository.

Testing Done

  • build and test
$ make clean test-in-docker rpm; echo $?
0
  • Manual testing
$ sudo start ecs
$ docker inspect ecs-agent -f '{{.Config.Env}}' | less
[... ECS_AVAILABLE_LOGGING_DRIVERS=["json-file","syslog","awslogs","none"] ...]
$ aws ecs describe-container-instances --cluster $ECS_CLUSTER --container-instance $INSTANCE --query containerInstances[0].attributes[2]
{
    "name": "com.amazonaws.ecs.capability.logging-driver.none"
}

Changelog entry

- Add 'none' logging driver to ECS agent's config

Copy link

@richardpen richardpen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, one minor comment

@@ -224,7 +224,8 @@ func validateCommonCreateContainerOptions(opts godocker.CreateContainerOptions,
expectKey("ECS_AGENT_CONFIG_FILE_PATH="+config.AgentJSONConfigFile(), envVariables, t)
expectKey("ECS_UPDATE_DOWNLOAD_DIR="+config.CacheDirectory(), envVariables, t)
expectKey("ECS_UPDATES_ENABLED=true", envVariables, t)
expectKey(`ECS_AVAILABLE_LOGGING_DRIVERS=["json-file","syslog","awslogs"]`, envVariables, t)
expectKey(`ECS_AVAILABLE_LOGGING_DRIVERS=["json-file","syslog","awslogs","none"]`,
envVariables, t)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this should be a tab?

This commit modifies the `ECS_AVAILABLE_LOGGING_DRIVERS` env var
for the Agent to include `none` logging driver. This compliments
aws/amazon-ecs-agent#1041 PR in the
ECS Agent repository.
@aaithal aaithal force-pushed the registerNoneLoggingDriverOnStart branch from e452100 to 30ee220 Compare October 30, 2017 16:37
@aaithal aaithal merged commit b08a81d into aws:dev Oct 30, 2017
@samuelkarp
Copy link
Contributor

👍

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants