rename some files

Author: Allen Wang

Diff for: app/app.js

@@ -16,7 +16,7 @@ var store = new RedisStore({
   // port: 6379,
   // client: new Redis(6379, 'redis-master'),
   client: new Redis({
-    sentinels: [{ host: 'redis-sentinel', port: 26379 }],
+    sentinels: [{ host: 'redis-sentinel-1', port: 26379 }],
     name: 'mymaster'
   }),
   ttl: 260

Diff for: docker-compose.yaml

@@ -1,43 +1,47 @@
 version: '3'
 services:
-  server1:
-    container_name: server1
+  server-1:
+    container_name: server-1
     build: ./app
     depends_on:
-      - redis-master
+      - redis-sentinel-1
     environment:
-      - SERVER_NAME=server1
-  server2:
-    container_name: server2
+      - SERVER_NAME=server-1
+
+  server-2:
+    container_name: server-2
     build: ./app
     depends_on:
-      - redis-master
+      - redis-sentinel-1
     environment:
-      - SERVER_NAME=server2
+      - SERVER_NAME=server-2
+
   redis-master:
     container_name: redis-master
     image: redis
+
   redis-slave:
     container_name: redis-slave
     image: redis
     command: redis-server --slaveof redis-master 6379
     depends_on:
       - redis-master
-  redis-sentinel:
-    container_name: redis-sentinel
+
+  redis-sentinel-1:
+    container_name: redis-sentinel-1
     image: redis
     depends_on:
       - redis-slave
     volumes:
-      - ./redis-sentinel.conf:/etc/nginx/sentinel.conf:rw
-    command: redis-server /etc/nginx/sentinel.conf --sentinel
+      - ./redis-sentinel-1.conf:/etc/nginx/sentinel.conf
+    command: redis-server /etc/nginx/sentinel.conf --sentinel --port 26379
 
   nginx:
     container_name: load-balancer
     image: nginx
     depends_on:
-      - server1
-      - server2
+      - server-1
+      - server-2
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
     ports:

Diff for: nginx.conf

@@ -25,8 +25,8 @@ http {
 
   # custom directive for load balancing
   upstream nodejs {
-    server server1:3000;
-    server server2:3000;
+    server server-1:3000;
+    server server-2:3000;
   }
   server {
     #server_name test.com;

Diff for: redis-sentinel.conf renamed to redis-sentinel-1.conf

@@ -1,18 +1,19 @@
 #daemonize yes
-port 26379
+#port 26379
 sentinel myid 2ff8a11b3d6a13bc867062ca8597e0614d94dce8
-sentinel monitor mymaster 172.19.0.2 6379 1
+sentinel monitor mymaster 172.19.0.3 6379 1
 sentinel down-after-milliseconds mymaster 3000
 sentinel parallel-syncs mymaster 2
 #sentinel auth-pass mymaster 123456
 #sentinel notification-script mymaster /etc/redis/notify.sh
 #sentinel client-reconfig-script mymaster /etc/redis/failover.sh
 #logfile /var/log/redis/redis-sentinel.log
 # Generated by CONFIG REWRITE
+port 26379
 dir "/data"
-sentinel config-epoch mymaster 9
-sentinel leader-epoch mymaster 9
+sentinel config-epoch mymaster 11
+sentinel leader-epoch mymaster 11
+sentinel known-slave mymaster 172.19.0.2 6379
 sentinel known-slave mymaster 172.19.0.5 6379
 sentinel known-slave mymaster 172.19.0.4 6379
-sentinel known-slave mymaster 172.19.0.3 6379
-sentinel current-epoch 9
+sentinel current-epoch 11

Diff for: redis-sentinel-2.conf

@@ -0,0 +1,10 @@
+#daemonize yes
+#port 26379
+sentinel myid 2ff8a11b3d6a13bc867062ca8597e0614d94dce8
+sentinel monitor mymaster 172.19.0.2 6379 1
+sentinel down-after-milliseconds mymaster 3000
+sentinel parallel-syncs mymaster 2
+#sentinel auth-pass mymaster 123456
+#sentinel notification-script mymaster /etc/redis/notify.sh
+#sentinel client-reconfig-script mymaster /etc/redis/failover.sh
+#logfile /var/log/redis/redis-sentinel.log