Skip to content

Commit 099c4de

Browse files
kobi97kobi97
authored
Merge pull request #6 from kobi97/improve/change_env_variable
Improve/change env variable
2 parents efaf525 + aca7f21 commit 099c4de

File tree

4 files changed

+66
-66
lines changed

4 files changed

+66
-66
lines changed

‎README.md‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,26 @@ TARGET_DB 접근 권한은 **REPLICATION SLAVE, REPLICATION CLIENT, SELECT** 가
4141

4242
[.env.local](https://github.com/ridi/php-binlog-collector/tree/master/demo/include/.env.local)는 아래와 같습니다.
4343

44-
TARGET_DB는 분석할 DB, HISTORY_WRITE_DB는 분석 위치 및 이력 데이터를 저장할 DB 입니다.
44+
BINLOG_MYSQL_TARGET는 분석할 DB, BINLOG_MYSQL_HISTORY_WRITE는 분석 위치 및 이력 데이터를 저장할 DB 입니다.
4545

4646
```
47-
ENABLE_SENTRY = false
48-
SENTRY_KEY =
49-
TARGET_DB_HOST = 127.0.0.1
50-
TARGET_DB_USER = repl
51-
TARGET_DB_PORT = 3307
52-
TARGET_DB_PASSWORD = 1234
53-
TARGET_DB_DBNAME = php_mysql_replication
54-
TARGET_DB_DRIVER = pdo_mysql
55-
TARGET_DB_CHARSET = utf8
56-
57-
HISTORY_WRITE_DB_HOST = 127.0.0.1
58-
HISTORY_WRITE_DB_USER = testUser
59-
HISTORY_WRITE_DB_PORT = 3308
60-
HISTORY_WRITE_DB_PASSWORD = testUser
61-
HISTORY_WRITE_DB_DBNAME = platform
62-
HISTORY_WRITE_DB_DRIVER = pdo_mysql
63-
HISTORY_WRITE_DB_CHARSET = utf8
47+
BINLOG_ENABLE_SENTRY=0
48+
BINLOG_SENTRY_KEY=
49+
BINLOG_MYSQL_TARGET_HOST=127.0.0.1
50+
BINLOG_MYSQL_TARGET_USER=repl
51+
BINLOG_MYSQL_TARGET_PORT=3307
52+
BINLOG_MYSQL_TARGET_PASSWORD=1234
53+
BINLOG_MYSQL_TARGET_DBNAME=php_mysql_replication
54+
BINLOG_MYSQL_TARGET_DRIVER=pdo_mysql
55+
BINLOG_MYSQL_TARGET_CHARSET=utf8
56+
57+
BINLOG_MYSQL_HISTORY_WRITE_HOST=127.0.0.1
58+
BINLOG_MYSQL_HISTORY_WRITE_USER=testUser
59+
BINLOG_MYSQL_HISTORY_WRITE_PORT=3308
60+
BINLOG_MYSQL_HISTORY_WRITE_PASSWORD=testUser
61+
BINLOG_MYSQL_HISTORY_WRITE_DBNAME=platform
62+
BINLOG_MYSQL_HISTORY_WRITE_DRIVER=pdo_mysql
63+
BINLOG_MYSQL_HISTORY_WRITE_CHARSET=utf8
6464
```
6565

6666
해당 설정 정보는 demo에 docker 기반 환경에 들어 있는 기본 연결 정보입니다.

‎demo/include/.env.local‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
ENABLE_SENTRY = false
2-
SENTRY_KEY =
1+
BINLOG_ENABLE_SENTRY=0
2+
#BINLOG_SENTRY_KEY=
33

4-
TARGET_DB_HOST = 127.0.0.1
5-
TARGET_DB_USER = repl
6-
TARGET_DB_PORT = 13306
7-
TARGET_DB_PASSWORD = 1234
8-
TARGET_DB_DBNAME = php_mysql_replication
9-
TARGET_DB_DRIVER = pdo_mysql
10-
TARGET_DB_CHARSET = utf8
4+
BINLOG_MYSQL_TARGET_HOST=127.0.0.1
5+
BINLOG_MYSQL_TARGET_USER=repl
6+
BINLOG_MYSQL_TARGET_PORT=13306
7+
BINLOG_MYSQL_TARGET_PASSWORD=1234
8+
BINLOG_MYSQL_TARGET_DBNAME=php_mysql_replication
9+
BINLOG_MYSQL_TARGET_DRIVER=pdo_mysql
10+
BINLOG_MYSQL_TARGET_CHARSET=utf8
1111

12-
HISTORY_WRITE_DB_HOST = 127.0.0.1
13-
HISTORY_WRITE_DB_USER = testUser
14-
HISTORY_WRITE_DB_PORT = 13307
15-
HISTORY_WRITE_DB_PASSWORD = testUser
16-
HISTORY_WRITE_DB_DBNAME = platform
17-
HISTORY_WRITE_DB_DRIVER = pdo_mysql
18-
HISTORY_WRITE_DB_CHARSET = utf8
12+
BINLOG_MYSQL_HISTORY_WRITE_HOST=127.0.0.1
13+
BINLOG_MYSQL_HISTORY_WRITE_USER=testUser
14+
BINLOG_MYSQL_HISTORY_WRITE_PORT=13307
15+
BINLOG_MYSQL_HISTORY_WRITE_PASSWORD=testUser
16+
BINLOG_MYSQL_HISTORY_WRITE_DBNAME=platform
17+
BINLOG_MYSQL_HISTORY_WRITE_DRIVER=pdo_mysql
18+
BINLOG_MYSQL_HISTORY_WRITE_CHARSET=utf8

‎src/Binlog/Collector/Config/BinlogEnvConfig.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,27 @@ class BinlogEnvConfig
3030
public static function getTargetBinlogDbParams(): array
3131
{
3232
return [
33-
'host' => getenv('TARGET_DB_HOST'),
34-
'user' => getenv('TARGET_DB_USER'),
35-
'port' => getenv('TARGET_DB_PORT'),
36-
'password' => getenv('TARGET_DB_PASSWORD'),
37-
'dbname' => getenv('TARGET_DB_DBNAME'),
38-
'driver' => getenv('TARGET_DB_DRIVER'),
39-
'charset' => getenv('TARGET_DB_CHARSET'),
33+
'host' => getenv('BINLOG_MYSQL_TARGET_HOST'),
34+
'user' => getenv('BINLOG_MYSQL_TARGET_USER'),
35+
'port' => getenv('BINLOG_MYSQL_TARGET_PORT'),
36+
'password' => getenv('BINLOG_MYSQL_TARGET_PASSWORD'),
37+
'dbname' => getenv('BINLOG_MYSQL_TARGET_DBNAME'),
38+
'driver' => getenv('BINLOG_MYSQL_TARGET_DRIVER'),
39+
'charset' => getenv('BINLOG_MYSQL_TARGET_CHARSET'),
4040
'driverOptions' => [\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'],
4141
];
4242
}
4343

4444
public static function getHistoryWriteDbParams(): array
4545
{
4646
return [
47-
'host' => getenv('HISTORY_WRITE_DB_HOST'),
48-
'user' => getenv('HISTORY_WRITE_DB_USER'),
49-
'port' => getenv('HISTORY_WRITE_DB_PORT'),
50-
'password' => getenv('HISTORY_WRITE_DB_PASSWORD'),
51-
'dbname' => getenv('HISTORY_WRITE_DB_DBNAME'),
52-
'driver' => getenv('HISTORY_WRITE_DB_DRIVER'),
53-
'charset' => getenv('HISTORY_WRITE_DB_CHARSET'),
47+
'host' => getenv('BINLOG_MYSQL_HISTORY_WRITE_HOST'),
48+
'user' => getenv('BINLOG_MYSQL_HISTORY_WRITE_USER'),
49+
'port' => getenv('BINLOG_MYSQL_HISTORY_WRITE_PORT'),
50+
'password' => getenv('BINLOG_MYSQL_HISTORY_WRITE_PASSWORD'),
51+
'dbname' => getenv('BINLOG_MYSQL_HISTORY_WRITE_DBNAME'),
52+
'driver' => getenv('BINLOG_MYSQL_HISTORY_WRITE_DRIVER'),
53+
'charset' => getenv('BINLOG_MYSQL_HISTORY_WRITE_CHARSET'),
5454
'driverOptions' => [\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'],
5555
];
5656
}
@@ -88,8 +88,8 @@ public static function extendDefaultConfig(
8888
}
8989

9090
$self = new self();
91-
$self->enable_sentry = getenv('ENABLE_SENTRY');
92-
$self->sentry_key = getenv('SENTRY_KEY');
91+
$self->enable_sentry = (bool)getenv('BINLOG_ENABLE_SENTRY');
92+
$self->sentry_key = getenv('BINLOG_SENTRY_KEY');
9393
$self->binlog_connect_array = array_merge($default_binlog_connect_array, $replace_binlog_connect_array);
9494
$self->binlog_config_array = array_merge($default_binlog_config_array, $replace_binlog_config_array);
9595
$self->row_event_value_skipper = $row_event_value_skipper;

‎tests/.env.test‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
ENABLE_SENTRY = false
2-
SENTRY_KEY =
1+
BINLOG_ENABLE_SENTRY=0
2+
#BINLOG_SENTRY_KEY=
33

4-
TARGET_DB_HOST = 127.0.0.1
5-
TARGET_DB_USER = repl
6-
TARGET_DB_PORT = 13306
7-
TARGET_DB_PASSWORD = 1234
8-
TARGET_DB_DBNAME = php_mysql_replication
9-
TARGET_DB_DRIVER = pdo_mysql
10-
TARGET_DB_CHARSET = utf8
4+
BINLOG_MYSQL_TARGET_HOST=127.0.0.1
5+
BINLOG_MYSQL_TARGET_USER=repl
6+
BINLOG_MYSQL_TARGET_PORT=13306
7+
BINLOG_MYSQL_TARGET_PASSWORD=1234
8+
BINLOG_MYSQL_TARGET_DBNAME=php_mysql_replication
9+
BINLOG_MYSQL_TARGET_DRIVER=pdo_mysql
10+
BINLOG_MYSQL_TARGET_CHARSET=utf8
1111

12-
HISTORY_WRITE_DB_HOST = 127.0.0.1
13-
HISTORY_WRITE_DB_USER = testUser
14-
HISTORY_WRITE_DB_PORT = 13307
15-
HISTORY_WRITE_DB_PASSWORD = testUser
16-
HISTORY_WRITE_DB_DBNAME = platform
17-
HISTORY_WRITE_DB_DRIVER = pdo_mysql
18-
HISTORY_WRITE_DB_CHARSET = utf8
12+
BINLOG_MYSQL_HISTORY_WRITE_HOST=127.0.0.1
13+
BINLOG_MYSQL_HISTORY_WRITE_USER=testUser
14+
BINLOG_MYSQL_HISTORY_WRITE_PORT=13307
15+
BINLOG_MYSQL_HISTORY_WRITE_PASSWORD=testUser
16+
BINLOG_MYSQL_HISTORY_WRITE_DBNAME=platform
17+
BINLOG_MYSQL_HISTORY_WRITE_DRIVER=pdo_mysql
18+
BINLOG_MYSQL_HISTORY_WRITE_CHARSET=utf8

0 commit comments

Comments
 (0)