Improve catching time limit exceeded

64json · 64json · commit 556893741439 · 2018-12-03T02:54:12.000-05:00
diff --git a/src/languages/Exeutor.js b/src/languages/Exeutor.js
@@ -14,9 +14,11 @@ class Executor extends Commander {
 
   execute(tempPath, command) {
     const containerName = uuid.v4();
-    let timer = setTimeout(() => {
-      timer = null;
-      execute(`docker kill ${containerName}`, this.cwd);
+    let killed = false;
+    const timer = setTimeout(() => {
+      execute(`docker kill ${containerName}`, this.cwd).then(() => {
+        killed = true;
+      });
     }, timeLimit);
     return execute([
       `docker run --rm`,
@@ -30,13 +32,9 @@ class Executor extends Commander {
       '/bin/bash -c',
       `"${command}"`,
     ].join(' '), this.cwd).catch(error => {
-      if (timer) {
-        clearTimeout(timer);
-      } else {
-        console.error('Time Limit Exceeded');
-      }
+      if (killed) console.error('Time Limit Exceeded');
       throw error;
-    });
+    }).finally(() => clearTimeout(timer));
   }
 
   compile(tempPath) {
diff --git a/src/languages/cpp/builder/index.js b/src/languages/cpp/builder/index.js
@@ -74,4 +74,4 @@ set_target_properties(tracers
   return { name, content };
 });
 
-export default builder;
+export default builder;
