perf(kill-container): swithc from observable to promise when killing …

…docker container
bleenco · Aug 4, 2017 · d37a837 · d37a837
1 parent a23acf3
commit d37a837
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/api/docker.ts b/src/api/docker.ts
@@ -44,13 +44,10 @@ export function killAllContainers(): Observable<boolean> {
   });
 }
 
-export function killContainer(id: string): Observable<boolean> {
-  return new Observable(observer => {
-    const kill = spawn('docker', ['rm', id, '-f']);
-    kill.on('close', code => {
-      observer.next();
-      observer.complete();
-    });
+export function killContainer(id: string): Promise<void> {
+  return new Promise(resolve => {
+    const kill = pty.spawn('docker', ['rm', id, '-f']);
+    kill.on('exit', code => resolve());
   });
 }
 

diff --git a/src/api/process-manager.ts b/src/api/process-manager.ts
@@ -385,7 +385,7 @@ export function stopJob(jobId: number): Promise<any> {
           dbJob.updateJob({ id: jobId, end_time: new Date(), status: 'failed', log: log })
             .then(() => {
               const name = `abstruse_${jobProcess.build_id}_${jobProcess.job_id}`;
-              return killContainer(name).toPromise();
+              return killContainer(name);
             })
             .then(() => resolve(jobProcess));
         } else {
@@ -402,7 +402,7 @@ export function stopJob(jobId: number): Promise<any> {
             })
             .then(() => {
               const name = `abstruse_${job.builds_id}_${job.id}`;
-              return killContainer(name).toPromise();
+              return killContainer(name);
             })
             .then(() => resolve(job));
         }