fix(stats): unsubscribe from stats subscription when leaving dashboard

bleenco · Dec 13, 2017 · 4b73041 · 4b73041
1 parent a9ec7e5
commit 4b73041
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 50 deletions.
diff --git a/e2e/140_dashboard.e2e.ts b/e2e/140_dashboard.e2e.ts
@@ -34,8 +34,8 @@ describe('Dashboard', () => {
 
   it('should go to dashboard and see memory widget', () => {
     return  browser.get('/dashboard')
-    .then((): any => browser.wait(() => element(by.css('[name="memory-usage"]')).isPresent()))
-    .then(() => element(by.css('[name="memory-usage"]')).getCssValue('width'))
-    .then(width => expect(width).to.not.equals('0px'));
+      .then((): any => browser.wait(() => element(by.css('[name="memory-usage"]')).isPresent()))
+      .then(() => element(by.css('[name="memory-usage"]')).getCssValue('width'))
+      .then(width => expect(width).to.not.equals('0px'));
   });
 });
diff --git a/src/api/docker-stats.ts b/src/api/docker-stats.ts
@@ -1,60 +1,41 @@
 import { Observable, Observer } from 'rxjs';
 import * as utils from './utils';
-import * as dockerode from 'dockerode';
+import { listContainers,  calculateContainerStats } from './docker';
 import { processes } from './process-manager';
 
-export const docker = new dockerode();
-
 export function getContainersStats(): Observable<any> {
   return new Observable(observer => {
-    Observable
+    const sub = Observable
       .interval(2000)
       .timeInterval()
       .mergeMap(() => {
-        return docker.listContainers().then(containers => {
-          return Promise.all(containers.map(container => {
-            return docker.getContainer(container.Id).stats().then((stream: any) => {
-              let json = '';
-              return new Promise(resolve => {
-                stream.on('data', buf => {
-                  let rawJson = json + buf.toString();
-                  try {
-                    let data = JSON.parse(rawJson);
-
-                    if (data && data.precpu_stats.system_cpu_usage) {
-                      const jobId = container.Names[0].split('_')[2] || -1;
-                      const job = processes.find(p => p.job_id === Number(jobId));
-                      let debug = false;
-                      if (job) {
-                        debug = job.debug || false;
-                      }
-
-                      const stats = {
-                        id: container.Id,
-                        name: container.Names[0].substr(1) || '',
-                        cpu: getCpuData(data),
-                        network: getNetworkData(data),
-                        memory: getMemory(data),
-                        debug: debug
-                      };
-
-                      stream.destroy();
-                      resolve(stats);
-                    }
-                  } catch (e) {
-                    json = rawJson;
-                  }
-                });
-              });
-            });
-          })).then(stats => stats);
-        });
+        return listContainers()
+          .then(containers => Promise.all(containers.map(c => getContainerStats(c))));
       })
       .map(stats => observer.next({ type: 'containersStats', data: stats }))
       .subscribe();
+
+    return () => {
+      if (sub) {
+        sub.unsubscribe();
+      }
+    };
   }).share();
 }
 
+function getContainerStats(container: any): Promise<any> {
+  return calculateContainerStats(container, processes).then(stats => {
+    return {
+      id: stats.id,
+      name: stats.name,
+      cpu: getCpuData(stats.data),
+      network: getNetworkData(stats.data),
+      memory: getMemory(stats.data),
+      debug: stats.debug
+    };
+  });
+}
+
 function getCpuData(json: any): { usage: string, cores: number } {
   const postCpuStats = json.cpu_stats;
   const preCpuStats = json.precpu_stats;

diff --git a/src/api/docker.ts b/src/api/docker.ts
@@ -137,8 +137,12 @@ export function attachExec(id: string, cmd: any): Observable<any> {
   });
 }
 
+export function listContainers(): Promise<dockerode.ContainerInfo[]> {
+  return docker.listContainers();
+}
+
 export function stopAllContainers(): Promise<any[]> {
-  return docker.listContainers()
+  return listContainers()
     .then(containers => {
       return Promise.all(containers.map(containerInfo => {
         return docker.getContainer(containerInfo.Id).stop();
@@ -255,3 +259,42 @@ export function isDockerInstalled(): Observable<boolean> {
     });
   });
 }
+
+export function calculateContainerStats(
+  container: dockerode.ContainerInfo,
+  processes: any
+): Promise<any> {
+  return docker.getContainer(container.Id).stats()
+    .then(stream => {
+      let json = '';
+      return new Promise((resolve, reject) => {
+        stream.on('data', buf => {
+          let rawJson = json + buf.toString();
+          try {
+            let data = JSON.parse(rawJson);
+
+            if (data && data.precpu_stats.system_cpu_usage) {
+              const jobId = container.Names[0].split('_')[2] || -1;
+              const job = processes.find(p => p.job_id === Number(jobId));
+              let debug = false;
+              if (job) {
+                debug = job.debug || false;
+              }
+
+              const stats = {
+                id: container.Id,
+                name: container.Names[0].substr(1) || '',
+                debug: debug,
+                data: data
+              };
+
+              stream.destroy();
+              resolve(stats);
+            }
+          } catch (e) {
+            json = rawJson;
+          }
+        });
+      });
+    });
+}
diff --git a/src/api/socket.ts b/src/api/socket.ts
@@ -41,6 +41,7 @@ export interface Client {
   session: { cookie: any, ip: string, userId: number, email: string, isAdmin: boolean };
   socket: uws.Socket;
   send: Function;
+  subscriptions: { stats: Subscription };
 }
 
 export class SocketServer {
@@ -107,7 +108,8 @@ export class SocketServer {
         sessionID: socket.upgradeReq.sessionID,
         session: socket.upgradeReq.session,
         socket: socket,
-        send: (message: any) => client.socket.send(JSON.stringify(message))
+        send: (message: any) => client.socket.send(JSON.stringify(message)),
+        subscriptions: { stats: null }
       };
       this.addClient(client);
 
@@ -306,9 +308,16 @@ export class SocketServer {
       break;
 
       case 'subscribeToStats':
-        Observable.merge(...[
-          memory(), cpu(), getContainersStats()
-        ]).subscribe(event => client.send(event));
+        client.subscriptions.stats =
+          Observable.merge(...[
+            memory(), cpu(), getContainersStats()
+          ]).subscribe(event => client.send(event));
+      break;
+
+      case 'unsubscribeFromStats':
+        if (client.subscriptions.stats) {
+          client.subscriptions.stats.unsubscribe();
+        }
       break;
     }
   }