Skip to content

Commit

Permalink
Merge branch 'feature/#551-change-prod-server' of https://github.com/…
Browse files Browse the repository at this point in the history
…woowacourse-teams/2024-staccato into feature/#551-change-prod-server
  • Loading branch information
linirini committed Nov 28, 2024
2 parents 6e52524 + 6d9967e commit 4bcb32c
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 33 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/backend-ci-cd-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ jobs:
needs: ci
runs-on: [ self-hosted, prod ]

strategy:
matrix:
runner: [ prod-a, prod-b ]

steps:
- name: execute deploy.sh
run: bash /home/ubuntu/staccato/deploy.sh
23 changes: 11 additions & 12 deletions backend/src/main/java/com/staccato/config/db/DataSourceConfig.java
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
package com.staccato.config.db;

import static com.staccato.config.db.ReaderDataSourceConfig.READER;
import static com.staccato.config.db.ReaderDataSourceConfig.READER_DATA_SOURCE;
import static com.staccato.config.db.WriterDataSourceConfig.WRITER;
import static com.staccato.config.db.WriterDataSourceConfig.WRITER_DATA_SOURCE;

import java.util.HashMap;
import java.util.Map;

import javax.sql.DataSource;

import jakarta.persistence.EntityManagerFactory;

import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
import org.springframework.context.annotation.Primary;
import org.springframework.context.annotation.Profile;
import org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.transaction.PlatformTransactionManager;

@Configuration
@Profile("prod")
import static com.staccato.config.db.ReaderDataSourceConfig.READER;
import static com.staccato.config.db.ReaderDataSourceConfig.READER_DATA_SOURCE;
import static com.staccato.config.db.WriterDataSourceConfig.WRITER;
import static com.staccato.config.db.WriterDataSourceConfig.WRITER_DATA_SOURCE;

/**
* DB Replication을 위한 DataSource 설정 파일입니다.
* 지금은 사용하지 않은 상태로 Disable 상태입니다.
* <p>
* 만약, 다시 사용하게 된다면 @Profile, @Configuration 설정이 필요합니다.
*/
public class DataSourceConfig {
@DependsOn({WRITER_DATA_SOURCE, READER_DATA_SOURCE})
@Bean
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
package com.staccato.config.db;

import static org.springframework.transaction.support.TransactionSynchronizationManager.isCurrentTransactionReadOnly;
import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
import lombok.extern.slf4j.Slf4j;

import static org.springframework.transaction.support.TransactionSynchronizationManager.isCurrentTransactionReadOnly;
import static com.staccato.config.db.ReaderDataSourceConfig.READER;
import static com.staccato.config.db.WriterDataSourceConfig.WRITER;

import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;

import lombok.extern.slf4j.Slf4j;

/**
* DB Replication을 위한 DataSource 설정 파일입니다.
* 지금은 사용하지 않은 상태로 Disable 상태입니다.
* <p>
*/
@Slf4j
public class DynamicRoutingDataSource extends AbstractRoutingDataSource {
@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package com.staccato.config.db;

import javax.sql.DataSource;

import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;

import com.zaxxer.hikari.HikariDataSource;

@Configuration
@Profile("prod")
/**
* DB Replication을 위한 DataSource 설정 파일입니다.
* 지금은 사용하지 않은 상태로 Disable 상태입니다.
* <p>
* 만약, 다시 사용하게 된다면 @Profile, @Configuration 설정이 필요합니다.
*/
public class ReaderDataSourceConfig {
protected static final String READER_DATA_SOURCE = "readerDataSource";
protected static final String READER = "reader";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package com.staccato.config.db;

import javax.sql.DataSource;

import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;

import com.zaxxer.hikari.HikariDataSource;

@Configuration
@Profile("prod")
/**
* DB Replication을 위한 DataSource 설정 파일입니다.
* 지금은 사용하지 않은 상태로 Disable 상태입니다.
* <p>
* 만약, 다시 사용하게 된다면 @Profile, @Configuration 설정이 필요합니다.
*/
public class WriterDataSourceConfig {
protected static final String WRITER_DATA_SOURCE = "writerDataSource";
protected static final String WRITER = "writer";
Expand Down

0 comments on commit 4bcb32c

Please sign in to comment.