update folder structure

Author: Allen Wang

Diff for: app/app.js

@@ -12,13 +12,14 @@ var app = express();
 
 var serverName = process.env.SERVER_NAME || 'SERVER';
 var store = new RedisStore({
-  // host: 'redis-master',
+  // host: 'localhost',
   // port: 6379,
   // client: new Redis(6379, 'redis-master'),
   client: new Redis({
-    sentinels: [{ host: 'redis-sentinel-1', port: 26379 }],
+    sentinels: [{ host: 'redis-sentinel', port: 26379 }],
     name: 'mymaster'
   }),
+  // client: new Redis(),
   ttl: 260
 });
 // view engine setup
@@ -61,7 +62,18 @@ app.get('/main', function(req, res, next) {
   if (!req.session.login) return res.redirect('/login');
   next();
 }, function(req, res, next) {
-  res.render('index', { title: serverName });
+  store.all(function(err, sessions) {
+    var users = sessions.filter(function(session) {
+      return session.login;
+    }).map(function(session) {
+      return session.user;
+    });
+    res.render('index', { 
+      title: serverName, 
+      user: req.session.user,
+      users: users
+    });
+  })
 });
 
 app.get('/login', function(req, res, next) {
@@ -70,6 +82,7 @@ app.get('/login', function(req, res, next) {
 
 app.post('/login', function(req, res, next) {
   req.session.login = true;
+  req.session.user = req.body.username
   res.redirect('/main');
 });
 

Diff for: app/views/index.jade

@@ -2,7 +2,12 @@ extends layout
 
 block content
   h1= title
-  p Welcome to #{title}
-
+  p Hello #{user}, welcome to #{title}
+  hr
+  p Online User List:
+  ul
+  for name in users
+    li= name
+  hr 
   form(action="/logout", method="get")
     input(type="submit",value="logout")

Diff for: app/views/login.jade

@@ -3,10 +3,9 @@ extends layout
 block content
   h1 Please login first
   form(action="/login", method="post")
-    input(name="username", placeholder="username")
+    input(name="username", placeholder="User Name")
     br
-    input(type="password",name="username", placeholder="password")
     br
-    input(type="submit",value="submit")
+    input(type="submit",value="Login")
 
 

Diff for: docker-compose.yaml

@@ -4,15 +4,15 @@ services:
     container_name: server-1
     build: ./app
     depends_on:
-      - redis-sentinel-1
+      - redis-sentinel
     environment:
       - SERVER_NAME=server-1
 
   server-2:
     container_name: server-2
     build: ./app
     depends_on:
-      - redis-sentinel-1
+      - redis-sentinel
     environment:
       - SERVER_NAME=server-2
 
@@ -27,14 +27,12 @@ services:
     depends_on:
       - redis-master
 
-  redis-sentinel-1:
-    container_name: redis-sentinel-1
-    image: redis
+  redis-sentinel:
+    container_name: redis-sentinel
+    build: ./redis
     depends_on:
       - redis-slave
-    volumes:
-      - ./redis-sentinel-1.conf:/etc/nginx/sentinel.conf
-    command: redis-server /etc/nginx/sentinel.conf --sentinel --port 26379
+    command: redis-server /etc/redis-sentinel.conf --sentinel --port 26379
 
   nginx:
     container_name: load-balancer
@@ -43,6 +41,6 @@ services:
       - server-1
       - server-2
     volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+      - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
     ports:
     - 80:80

Diff for: nginx.conf renamed to nginx/nginx.conf

@@ -0,0 +1,3 @@
+FROM redis
+COPY ./redis-sentinel.conf /etc
+RUN chmod -R 666 /etc/redis-sentinel.conf

Diff for: redis-sentinel-1.conf

@@ -1,10 +1,9 @@
 #daemonize yes
 #port 26379
-sentinel myid 2ff8a11b3d6a13bc867062ca8597e0614d94dce8
-sentinel monitor mymaster 172.19.0.2 6379 1
-sentinel down-after-milliseconds mymaster 3000
+sentinel monitor mymaster redis-master 6379 1
+sentinel down-after-milliseconds mymaster 1000
 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
+#logfile /var/log/redis/redis-sentinel.log