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

Enhance Logging for Redis Connection Failures and Add API Endpoint for Gateway Settings #5391

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b3d7236
Update storage/redis_cluster.go
sweep-ai[bot] Aug 5, 2023
166c051
Update ci/tests/python-plugins/docker-compose.yml
sweep-ai[bot] Aug 5, 2023
9b37044
Update smoke-tests/plugin-aliasing/docker-compose.yml
sweep-ai[bot] Aug 5, 2023
c0e2bd0
Update storage/redis_cluster.go
sweep-ai[bot] Aug 5, 2023
f74d553
Update storage/redis_cluster.go
sweep-ai[bot] Aug 5, 2023
bfc807b
Update Makefile
sweep-ai[bot] Aug 5, 2023
af6c913
sweep: Fix linting errors in Otherfiles
sweep-ai[bot] Aug 5, 2023
c120ab2
Update storage/redis_cluster.go
sweep-ai[bot] Aug 5, 2023
3e9ba32
Update Makefile
sweep-ai[bot] Aug 5, 2023
8ef0011
Update Makefile
sweep-ai[bot] Aug 5, 2023
bd754f7
Update ci/tests/python-plugins/docker-compose.yml
sweep-ai[bot] Aug 5, 2023
40d8465
Update smoke-tests/plugin-aliasing/docker-compose.yml
sweep-ai[bot] Aug 5, 2023
52ade6a
Update storage/redis_cluster.go
sweep-ai[bot] Aug 5, 2023
aae4f79
Update Makefile
sweep-ai[bot] Aug 5, 2023
fc31de5
Update storage/redis_cluster.go
sweep-ai[bot] Aug 5, 2023
c2d2679
Update ci/tests/python-plugins/docker-compose.yml
sweep-ai[bot] Aug 5, 2023
b832de9
Update smoke-tests/plugin-aliasing/docker-compose.yml
sweep-ai[bot] Aug 5, 2023
05fc3bd
Update ci/tests/python-plugins/docker-compose.yml
sweep-ai[bot] Aug 5, 2023
45fab3c
Update smoke-tests/plugin-aliasing/docker-compose.yml
sweep-ai[bot] Aug 5, 2023
ec1d74a
Update Makefile
sweep-ai[bot] Aug 5, 2023
360aa4a
Update ci/tests/python-plugins/docker-compose.yml
sweep-ai[bot] Aug 5, 2023
80d2b2b
Update ci/tests/api-functionality/docker-compose.yml
sweep-ai[bot] Aug 5, 2023
e23cfe0
Merge main into sweep/enhance-redis-logging
sweep-ai[bot] Aug 7, 2023
2912ab8
Update storage/redis_cluster.go
sweep-ai[bot] Aug 7, 2023
1bf19bf
Update gateway/api.go
sweep-ai[bot] Aug 7, 2023
dfd7638
Update storage/redis_cluster.go
sweep-ai[bot] Aug 7, 2023
7cf3fc9
Update repo-policy/main.tf
sweep-ai[bot] Aug 7, 2023
06c4286
Merge main into sweep/enhance-redis-logging
sweep-ai[bot] Aug 8, 2023
b8edcef
Update storage/redis_cluster.go
sweep-ai[bot] Aug 8, 2023
ec634d0
Update storage/redis_cluster.go
sweep-ai[bot] Aug 8, 2023
8f95d57
Merge main into sweep/enhance-redis-logging
sweep-ai[bot] Aug 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions Makefile
Expand Up @@ -20,14 +20,14 @@ BENCH_RUN=NONE

.PHONY: test
test:
$(GOTEST) -run=$(TEST_REGEX) -count=$(TEST_COUNT) ./...
$(GOTEST) -run=$(TEST_REGEX) -count=$(TEST_COUNT) ./...

# lint runs all local linters that must pass before pushing
.PHONY: lint lint-install lint-fast
lint: lint-fast
goimports -local github.com/TykTechnologies,github.com/TykTechnologies/tyk/internal -w .
gofmt -w .
faillint -ignore-tests -paths "$(shell grep -v '^#' .faillint | xargs echo | sed 's/ /,/g')" ./...
@goimports -local github.com/TykTechnologies,github.com/TykTechnologies/tyk/internal -w .
@gofmt -w .
@faillint -ignore-tests -paths "$(shell grep -v '^#' .faillint | xargs echo | sed 's/ /,/g')" ./...

lint-fast: lint-install
go generate ./...
Expand Down Expand Up @@ -106,4 +106,3 @@ docker:

docker-std: build
docker build --platform ${BUILD_PLATFORM} --no-cache -t internal/tyk-gateway:std -f ci/Dockerfile.std .

1 change: 1 addition & 0 deletions Otherfiles
@@ -0,0 +1 @@
{No new files need to be created. We just need to modify the existing files to fix the linting errors.}
1 change: 1 addition & 0 deletions ci/tests/api-functionality/docker-compose.yml
@@ -1,6 +1,7 @@
services:
redis:
image: redis:6.0-alpine
command: bash -c "mkdir -p /etc && echo ID=$(uuidgen) > /etc/release"
networks: [ test-api-functionality ]
healthcheck:
test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
Expand Down
6 changes: 6 additions & 0 deletions ci/tests/python-plugins/docker-compose.yml
Expand Up @@ -2,8 +2,14 @@ version: "3"
services:
redis:
image: redis
command: bash -c "mkdir -p /etc && echo ID=$(uuidgen) > /etc/release"
ports:
- "0.0.0.0:6379:6379"
logging:
driver: "json-file"
options:
max-size: "500k"
max-file: "10"
healthcheck:
test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
interval: 5s
Expand Down