Skip to content

Commit 6a5fc61

Browse files
bjbcanbjbcan
committed
2 parents 5e5ddf1 + d59c112 commit 6a5fc61

35 files changed

+991
-626
lines changed

‎connectors/cassandra/README.md

Lines changed: 47 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,14 @@ Copy the _sample_ directory and it's contents i.e. _yml_ files, _mappers_ and te
100100
```xml
101101
<configuration debug="true" scan="true" scanPeriod="15 seconds">
102102

103-
<property name="START_UP_PATH" value="logs/redis-connect-startup.log"/>
104-
<property name="LOG_PATH" value="logs/redis-connect.log"/>
103+
<property name="LOG_REDIS_CONNECT_PATH" value="logs/redis-connect.log"/>
104+
<property name="LOG_REDIS_CONNECT_MANAGER_PATH" value="logs/redis-connect-manager.log"/>
105+
<property name="LOG_REDIS_CONNECT_HEARTBEAT_PATH" value="logs/redis-connect-heartbeat.log"/>
105106

106-
<appender name="STARTUP" class="ch.qos.logback.core.rolling.RollingFileAppender">
107-
<file>${START_UP_PATH}</file>
107+
<appender name="REDIS_CONNECT_HEARTBEAT" class="ch.qos.logback.core.rolling.RollingFileAppender">
108+
<file>${LOG_REDIS_CONNECT_HEARTBEAT_PATH}</file>
108109
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
109-
<fileNamePattern>logs/archived/startup.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
110+
<fileNamePattern>logs/archived/redis-connect-heartbeat.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
110111
<!-- each archived file, size max 10MB -->
111112
<maxFileSize>10MB</maxFileSize>
112113
<!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
@@ -118,9 +119,23 @@ Copy the _sample_ directory and it's contents i.e. _yml_ files, _mappers_ and te
118119
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
119120
</encoder>
120121
</appender>
121-
122-
<appender name="REDISCONNECT" class="ch.qos.logback.core.rolling.RollingFileAppender">
123-
<file>${LOG_PATH}</file>
122+
<appender name="REDIS_CONNECT_MANAGER" class="ch.qos.logback.core.rolling.RollingFileAppender">
123+
<file>${LOG_REDIS_CONNECT_MANAGER_PATH}</file>
124+
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
125+
<fileNamePattern>logs/archived/redis-connect-manager.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
126+
<!-- each archived file, size max 10MB -->
127+
<maxFileSize>10MB</maxFileSize>
128+
<!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
129+
<totalSizeCap>20GB</totalSizeCap>
130+
<!-- 60 days to keep -->
131+
<maxHistory>60</maxHistory>
132+
</rollingPolicy>
133+
<encoder>
134+
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
135+
</encoder>
136+
</appender>
137+
<appender name="REDIS_CONNECT" class="ch.qos.logback.core.rolling.RollingFileAppender">
138+
<file>${LOG_REDIS_CONNECT_PATH}</file>
124139
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
125140
<fileNamePattern>logs/archived/app.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
126141
<!-- each archived file, size max 10MB -->
@@ -134,48 +149,54 @@ Copy the _sample_ directory and it's contents i.e. _yml_ files, _mappers_ and te
134149
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
135150
</encoder>
136151
</appender>
137-
138152
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
153+
<withJansi>true</withJansi>
139154
<encoder>
140-
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
155+
<pattern>%d{HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{36}) - %msg%n</pattern>
141156
</encoder>
142157
</appender>
143158

144-
<logger name="startup" level="INFO" additivity="false">
145-
<appender-ref ref="STARTUP"/>
159+
<logger name="redis-connect-heartbeat" level="INFO" additivity="false">
160+
<appender-ref ref="REDIS_CONNECT_HEARTBEAT"/>
146161
<appender-ref ref="CONSOLE" />
147162
</logger>
148-
149-
<logger name="redisconnect" level="INFO" additivity="false">
150-
<appender-ref ref="REDISCONNECT"/>
163+
<logger name="redis-connect-manager" level="INFO" additivity="false">
164+
<appender-ref ref="REDIS_CONNECT_MANAGER"/>
151165
<appender-ref ref="CONSOLE" />
152166
</logger>
153-
154-
155-
<logger name="com.redislabs" level="INFO" additivity="false">
156-
<appender-ref ref="REDISCONNECT"/>
167+
<logger name="redis-connect" level="INFO" additivity="false">
168+
<appender-ref ref="REDIS_CONNECT"/>
157169
<appender-ref ref="CONSOLE" />
158170
</logger>
159171
<logger name="io.netty" level="OFF" additivity="false">
160-
<appender-ref ref="REDISCONNECT"/>
172+
<appender-ref ref="REDIS_CONNECT"/>
161173
<appender-ref ref="CONSOLE" />
162174
</logger>
163175
<logger name="io.lettuce" level="OFF" additivity="false">
164-
<appender-ref ref="REDISCONNECT"/>
176+
<appender-ref ref="REDIS_CONNECT"/>
165177
<appender-ref ref="CONSOLE" />
166178
</logger>
167-
<logger name="org.apache" level="OFF" additivity="false">
168-
<appender-ref ref="REDISCONNECT"/>
179+
<logger name="com.zaxxer" level="OFF" additivity="false">
180+
<appender-ref ref="REDIS_CONNECT"/>
181+
<appender-ref ref="CONSOLE"/>
182+
</logger>
183+
<logger name="io.debezium" level="INFO" additivity="false">
184+
<appender-ref ref="REDIS_CONNECT"/>
185+
<appender-ref ref="CONSOLE"/>
186+
</logger>
187+
<logger name="org.apache.kafka" level="OFF" additivity="false">
188+
<appender-ref ref="REDIS_CONNECT"/>
169189
<appender-ref ref="CONSOLE"/>
170190
</logger>
171191
<logger name="org.springframework" level="OFF" additivity="false">
172-
<appender-ref ref="REDISCONNECT"/>
192+
<appender-ref ref="REDIS_CONNECT"/>
173193
<appender-ref ref="CONSOLE"/>
174194
</logger>
175195

176196
<root>
177-
<appender-ref ref="STARTUP"/>
178-
<appender-ref ref="REDISCONNECT"/>
197+
<appender-ref ref="REDIS_CONNECT"/>
198+
<appender-ref ref="REDIS_CONNECT_MANAGER"/>
199+
<appender-ref ref="REDIS_CONNECT_HEARTBEAT"/>
179200
</root>
180201

181202
</configuration>

‎connectors/db2/demo/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ docker run \
7373
-e REDISCONNECT_JAVA_OPTIONS="-Xms256m -Xmx256m" \
7474
-v $(pwd)/config:/opt/redislabs/redis-connect-db2/config \
7575
--net host \
76-
redislabs/redis-connect-db2:pre-release-alpine
76+
redislabs/redis-connect-db2:latest
7777
```
7878

7979
</p>
@@ -138,7 +138,7 @@ docker run \
138138
-e REDISCONNECT_JAVA_OPTIONS="-Xms256m -Xmx256m" \
139139
-v $(pwd)/config:/opt/redislabs/redis-connect-db2/config \
140140
--net host \
141-
redislabs/redis-connect-db2:pre-release-alpine stage
141+
redislabs/redis-connect-db2:latest stage
142142
```
143143

144144
</p>
@@ -176,7 +176,7 @@ docker run \
176176
-e REDISCONNECT_JAVA_OPTIONS="-Xms256m -Xmx256m" \
177177
-v $(pwd)/config:/opt/redislabs/redis-connect-db2/config \
178178
--net host \
179-
redislabs/redis-connect-db2:pre-release-alpine start
179+
redislabs/redis-connect-db2:latest start
180180
```
181181

182182
</p>
@@ -456,7 +456,7 @@ docker run \
456456
-v $(pwd)/config:/opt/redislabs/redis-connect-db2/config \
457457
-v $(pwd)/extlib:/opt/redislabs/redis-connect-db2/extlib \
458458
--net host \
459-
redislabs/redis-connect-db2:pre-release-alpine stage
459+
redislabs/redis-connect-db2:latest stage
460460
```
461461

462462
</p>
@@ -479,7 +479,7 @@ docker run \
479479
-v $(pwd)/config:/opt/redislabs/redis-connect-db2/config \
480480
-v $(pwd)/extlib:/opt/redislabs/redis-connect-db2/extlib \
481481
--net host \
482-
redislabs/redis-connect-db2:pre-release-alpine start
482+
redislabs/redis-connect-db2:latest start
483483
```
484484

485485
</p>

‎connectors/db2/demo/config/logback.xml

Lines changed: 47 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
<configuration debug="true" scan="true" scanPeriod="30 seconds">
1+
<configuration debug="true" scan="true" scanPeriod="15 seconds">
22

3-
<property name="START_UP_PATH" value="logs/redis-connect-startup.log"/>
4-
<property name="LOG_PATH" value="logs/redis-connect.log"/>
3+
<property name="LOG_REDIS_CONNECT_PATH" value="logs/redis-connect.log"/>
4+
<property name="LOG_REDIS_CONNECT_MANAGER_PATH" value="logs/redis-connect-manager.log"/>
5+
<property name="LOG_REDIS_CONNECT_HEARTBEAT_PATH" value="logs/redis-connect-heartbeat.log"/>
56

6-
<appender name="STARTUP" class="ch.qos.logback.core.rolling.RollingFileAppender">
7-
<file>${START_UP_PATH}</file>
7+
<appender name="REDIS_CONNECT_HEARTBEAT" class="ch.qos.logback.core.rolling.RollingFileAppender">
8+
<file>${LOG_REDIS_CONNECT_HEARTBEAT_PATH}</file>
89
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
9-
<fileNamePattern>logs/archived/startup.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
10+
<fileNamePattern>logs/archived/redis-connect-heartbeat.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
1011
<!-- each archived file, size max 10MB -->
1112
<maxFileSize>10MB</maxFileSize>
1213
<!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
@@ -18,9 +19,23 @@
1819
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
1920
</encoder>
2021
</appender>
21-
22-
<appender name="REDISCONNECT" class="ch.qos.logback.core.rolling.RollingFileAppender">
23-
<file>${LOG_PATH}</file>
22+
<appender name="REDIS_CONNECT_MANAGER" class="ch.qos.logback.core.rolling.RollingFileAppender">
23+
<file>${LOG_REDIS_CONNECT_MANAGER_PATH}</file>
24+
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
25+
<fileNamePattern>logs/archived/redis-connect-manager.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
26+
<!-- each archived file, size max 10MB -->
27+
<maxFileSize>10MB</maxFileSize>
28+
<!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
29+
<totalSizeCap>20GB</totalSizeCap>
30+
<!-- 60 days to keep -->
31+
<maxHistory>60</maxHistory>
32+
</rollingPolicy>
33+
<encoder>
34+
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
35+
</encoder>
36+
</appender>
37+
<appender name="REDIS_CONNECT" class="ch.qos.logback.core.rolling.RollingFileAppender">
38+
<file>${LOG_REDIS_CONNECT_PATH}</file>
2439
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
2540
<fileNamePattern>logs/archived/app.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
2641
<!-- each archived file, size max 10MB -->
@@ -34,54 +49,54 @@
3449
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
3550
</encoder>
3651
</appender>
37-
3852
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
53+
<withJansi>true</withJansi>
3954
<encoder>
40-
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
55+
<pattern>%d{HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{36}) - %msg%n</pattern>
4156
</encoder>
4257
</appender>
4358

44-
<logger name="startup" level="INFO" additivity="false">
45-
<appender-ref ref="STARTUP"/>
59+
<logger name="redis-connect-heartbeat" level="INFO" additivity="false">
60+
<appender-ref ref="REDIS_CONNECT_HEARTBEAT"/>
4661
<appender-ref ref="CONSOLE" />
4762
</logger>
48-
49-
<logger name="redisconnect" level="INFO" additivity="false">
50-
<appender-ref ref="REDISCONNECT"/>
63+
<logger name="redis-connect-manager" level="INFO" additivity="false">
64+
<appender-ref ref="REDIS_CONNECT_MANAGER"/>
5165
<appender-ref ref="CONSOLE" />
5266
</logger>
53-
54-
55-
<logger name="com.redislabs" level="INFO" additivity="false">
56-
<appender-ref ref="REDISCONNECT"/>
67+
<logger name="redis-connect" level="INFO" additivity="false">
68+
<appender-ref ref="REDIS_CONNECT"/>
5769
<appender-ref ref="CONSOLE" />
5870
</logger>
5971
<logger name="io.netty" level="OFF" additivity="false">
72+
<appender-ref ref="REDIS_CONNECT"/>
6073
<appender-ref ref="CONSOLE" />
6174
</logger>
6275
<logger name="io.lettuce" level="OFF" additivity="false">
76+
<appender-ref ref="REDIS_CONNECT"/>
6377
<appender-ref ref="CONSOLE" />
6478
</logger>
6579
<logger name="com.zaxxer" level="OFF" additivity="false">
66-
<appender-ref ref="REDISCONNECT"/>
67-
<appender-ref ref="STARTUP"/>
80+
<appender-ref ref="REDIS_CONNECT"/>
81+
<appender-ref ref="CONSOLE"/>
6882
</logger>
69-
<logger name="io.debezium" level="OFF" additivity="false">
70-
<appender-ref ref="REDISCONNECT"/>
71-
<appender-ref ref="STARTUP"/>
83+
<logger name="io.debezium" level="INFO" additivity="false">
84+
<appender-ref ref="REDIS_CONNECT"/>
85+
<appender-ref ref="CONSOLE"/>
7286
</logger>
7387
<logger name="org.apache.kafka" level="OFF" additivity="false">
74-
<appender-ref ref="REDISCONNECT"/>
75-
<appender-ref ref="STARTUP"/>
88+
<appender-ref ref="REDIS_CONNECT"/>
89+
<appender-ref ref="CONSOLE"/>
7690
</logger>
7791
<logger name="org.springframework" level="OFF" additivity="false">
78-
<appender-ref ref="REDISCONNECT"/>
79-
<appender-ref ref="STARTUP"/>
92+
<appender-ref ref="REDIS_CONNECT"/>
93+
<appender-ref ref="CONSOLE"/>
8094
</logger>
8195

8296
<root>
83-
<appender-ref ref="STARTUP"/>
84-
<appender-ref ref="REDISCONNECT"/>
97+
<appender-ref ref="REDIS_CONNECT"/>
98+
<appender-ref ref="REDIS_CONNECT_MANAGER"/>
99+
<appender-ref ref="REDIS_CONNECT_HEARTBEAT"/>
85100
</root>
86101

87-
</configuration>
102+
</configuration>

‎connectors/db2/demo/extlib/redis-connect-custom-stage-demo-1.0-SNAPSHOT.jar

111 Bytes
Binary file not shown.

‎connectors/db2/k8s-docs/redis-connect-db2-stage.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
labels:
66
app: redis-connect-db2-stage # deployment label
77
spec:
8-
backOffLimit: 3 # try this many times before declaring failure
8+
backoffLimit: 3 # try this many times before declaring failure
99
template: # pod template
1010
metadata:
1111
labels:
@@ -14,7 +14,7 @@ spec:
1414
restartPolicy: OnFailure
1515
containers:
1616
- name: redis-connect-db2 # Container name
17-
image: redislabs/redis-connect-db2:pre-release-alpine #repo/image:tag
17+
image: redislabs/redis-connect-db2:latest #repo/image:tag
1818
# #### uncomment the following two lines for troubleshooting
1919
# command: [ "/bin/bash", "-c", "--" ]
2020
# args: [ "while true; do sleep 30; done;" ]

‎connectors/db2/k8s-docs/redis-connect-db2-start.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
topologyKey: "kubernetes.io/hostname"
2727
containers:
2828
- name: redis-connect-db2 # Container name
29-
image: redislabs/redis-connect-db2:pre-release-alpine #repo/image:tag
29+
image: redislabs/redis-connect-db2:latest #repo/image:tag
3030
#### uncomment the following two lines while you are setting up your
3131
command: [ "/bin/bash", "-c", "--" ]
3232
args: [ "while true; do sleep 30; done;" ]

0 commit comments

Comments
 (0)