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

Chore: fix feefeed container healthcheck #1768

Merged
merged 3 commits into from
Nov 13, 2020
Merged

Chore: fix feefeed container healthcheck #1768

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
055d894
fix feefeed container healtheck
ayrat555 Nov 12, 2020
3f5abba
log docker-compose logs
ayrat555 Nov 12, 2020
88d05e0
Merge branch 'master' into ayrat555/feefee-healthcheck
ayrat555 Nov 13, 2020
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
8 changes: 8 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,10 @@ jobs:
command: |
cd priv/cabbage
make start_daemon_services-2 || (START_RESULT=$?; docker-compose logs; exit $START_RESULT;)
- run:
name: Log daemon services
command: make cabbage-logs
background: true
- check_docker_status
- install_elixir
- run: sh .circleci/status.sh
Expand Down Expand Up @@ -743,6 +747,10 @@ jobs:
command: |
cd priv/cabbage
make start_daemon_services_reorg-2 || (START_RESULT=$?; docker-compose logs; exit $START_RESULT;)
- run:
name: Log daemon services
command: make cabbage-logs-reorg
background: true
- check_docker_status
- install_elixir
- run: sh .circleci/status.sh
Expand Down
9 changes: 9 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,15 @@ docker-push: docker
docker push $(WATCHER_IMAGE_NAME)
docker push $(WATCHER_INFO_IMAGE_NAME)


### Cabbage logs

cabbage-logs:
docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f ./priv/cabbage/docker-compose-2-specs.yml logs --follow

cabbage-logs-reorg:
docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f ./priv/cabbage/docker-compose-2-reorg.yml -f ./priv/cabbage/docker-compose-2-specs.yml logs --follow

### Cabbage reorg docker logs

cabbage-reorg-watcher-logs:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.feefeed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ services:
condition: service_healthy
restart: always
healthcheck:
test: curl localhost:4000
test: curl -v --silent http://localhost:4000/api/v1/fees 2>&1 | grep contract_address
interval: 30s
timeout: 1s
retries: 5
Expand Down