diff --git a/api/src/job.js b/api/src/job.js index 8948be1..2a9aa99 100644 --- a/api/src/job.js +++ b/api/src/job.js @@ -146,15 +146,12 @@ class Job { }); } - const kill_timeout = - (timeout >= 0 && - set_timeout(async _ => { - logger.info( - `Timeout exceeded timeout=${timeout} uuid=${this.uuid}` - ); - process.kill(proc.pid, 'SIGKILL'); - }, timeout)) || - null; + const kill_timeout = set_timeout(async _ => { + logger.info( + `Timeout exceeded timeout=${timeout} uuid=${this.uuid}` + ); + process.kill(proc.pid, 'SIGKILL'); + }, timeout); proc.stderr.on('data', async data => { if (eventBus !== null) { diff --git a/piston b/piston index c59002d..e6cc13e 100755 --- a/piston +++ b/piston @@ -14,13 +14,6 @@ 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 ===" @@ -66,7 +59,6 @@ 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 @@ -74,10 +66,7 @@ case $1 in stop) docker_compose down ;; bash) docker_compose exec api /bin/bash ;; - rebuild) - init_precommit - docker_compose build && docker_compose up -d - ;; + rebuild) docker_compose build && docker_compose up -d ;; update) git pull diff --git a/pre-commit b/pre-commit index 288a5e3..f592c88 100755 --- a/pre-commit +++ b/pre-commit @@ -1,7 +1,7 @@ #!/bin/sh echo "Linting staged files..." -npm install > /dev/null || exit 1 +npm install FILES=$(git diff --cached --name-only --diff-filter=ACMR | sed 's| |\\ |g') [ -z "$FILES" ] && exit 0