Merge pull request #366 from Brikaa/pre-commit

Improve pre-commit

api/src/job.js

@@ -146,12 +146,15 @@ class Job {
                 });
             }
 
-            const kill_timeout = set_timeout(async _ => {
+            const kill_timeout =
-                logger.info(
+                (timeout >= 0 &&
-                    `Timeout exceeded timeout=${timeout} uuid=${this.uuid}`
+                    set_timeout(async _ => {
-                );
+                        logger.info(
-                process.kill(proc.pid, 'SIGKILL');
+                            `Timeout exceeded timeout=${timeout} uuid=${this.uuid}`
-            }, timeout);
+                        );
+                        process.kill(proc.pid, 'SIGKILL');
+                    }, timeout)) ||
+                null;
 
             proc.stderr.on('data', async data => {
                 if (eventBus !== null) {

piston

@@ -14,6 +14,13 @@ docker_compose(){
     fi
 }
 
+init_precommit() {
+    if [ $PISTON_ENV == "dev" ]; then
+        rm -f .git/hooks/pre-commit
+        ln -s $(realpath $(dirname "$0"))/pre-commit .git/hooks/pre-commit
+    fi
+}
+
 case $1 in
     help)
         echo "=== Piston Management ==="
@@ -59,6 +66,7 @@ case $1 in
 
     restart) docker_compose restart ;;
     start)
+        init_precommit
         rm -f .git/hooks/pre-commit
         ln -s "$PISTON_PATH/pre-commit" "$PISTON_PATH/.git/hooks/pre-commit"
         docker_compose up -d
@@ -66,7 +74,10 @@ case $1 in
     stop) docker_compose down ;;
     bash) docker_compose exec api /bin/bash ;;
 
-    rebuild) docker_compose build && docker_compose up -d ;;
+    rebuild)
+        init_precommit
+        docker_compose build && docker_compose up -d
+        ;;
 
     update)
         git pull

pre-commit

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 echo "Linting staged files..."
-npm install
+npm install > /dev/null || exit 1
 
 FILES=$(git diff --cached --name-only --diff-filter=ACMR | sed 's| |\\ |g')
 [ -z "$FILES" ] && exit 0