diff --git a/.github/workflows/cd-prod.yml b/.github/workflows/cd-prod.yml index f7d84ca..cbe7da3 100644 --- a/.github/workflows/cd-prod.yml +++ b/.github/workflows/cd-prod.yml @@ -25,9 +25,7 @@ env: jobs: deploy: - if: > - github.event_name == 'workflow_dispatch' || - (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') + if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push' && github.event.workflow_run.head_branch == 'main') }} runs-on: ubuntu-latest timeout-minutes: 20 diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index b47a879..8837d19 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -22,3 +22,9 @@ spring: default_schema: user_service format_sql: true show-sql: true + +management: + endpoints: + web: + exposure: + include: health,info,prometheus diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 2e5c1a2..192c573 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -11,7 +11,12 @@ spring: username: ${POSTGRES_USER} password: ${POSTGRES_PASSWORD} driver-class-name: org.postgresql.Driver - + hikari: + maximum-pool-size: 5 + minimum-idle: 1 + idle-timeout: 30000 + max-lifetime: 1800000 + connection-timeout: 30000 data: redis: host: ${REDIS_HOST}