new README-based documentation

use git describe instead of hard-coded version number in build scripts
use latest capnp in docker build scripts
2026-10-14 07:01:27 +00:00 · 2017-08-20 07:43:44 +03:00 · 2017-08-19 10:47:27 +03:00 · 2017-08-19 10:43:01 +03:00 · 2017-08-16 09:09:01 +03:00 · 2017-08-16 09:08:57 +03:00
28 changed files with 1526 additions and 836 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 ###
-### Copyright 2015 Oliver Giles
+### Copyright 2016 Oliver Giles
 ###
 ### This file is part of Laminar
 ###
@@ -57,15 +57,13 @@ add_custom_command(OUTPUT laminar.capnp.c++ laminar.capnp.h

 # Zip and compile statically served resources
 generate_compressed_bins(${CMAKE_SOURCE_DIR}/src/resources index.html js/app.js
-    tpl/home.html tpl/job.html tpl/run.html tpl/browse.html
-    favicon.ico favicon-152.png icon.png progress.png)
+    favicon.ico favicon-152.png icon.png progress.gif)
+
 # Download 3rd-party frontend JS libs...
-file(DOWNLOAD https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.min.js
-        js/angular.min.js EXPECTED_MD5 b1137641dbb512a60e83d673f7e2d98f)
-file(DOWNLOAD https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular-route.min.js
-        js/angular-route.min.js EXPECTED_MD5 28ef7d7b4349ae0dce602748185ef32a)
-file(DOWNLOAD https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular-sanitize.min.js
-        js/angular-sanitize.min.js EXPECTED_MD5 0854eae86bcdf5f92b1ab2b458d8d054)
+file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js
+        js/vue.min.js EXPECTED_MD5 ae2fca1cfa0e31377819b1b0ffef704c)
+file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js
+        js/vue-router.min.js EXPECTED_MD5 5d3e35710dbe02de78c39e3e439b8d4e)
 file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js
        js/ansi_up.js EXPECTED_MD5 158566dc1ff8f2804de972f7e841e2f6)
 file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.min.js
@@ -75,9 +73,8 @@ file(DOWNLOAD https://raw.githubusercontent.com/tomsouthall/Chart.HorizontalBar.
 file(DOWNLOAD https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css
        css/bootstrap.min.css EXPECTED_MD5 5d5357cb3704e1f43a1f5bfed2aebf42)
 # ...and compile them
-generate_compressed_bins(${CMAKE_BINARY_DIR} js/angular.min.js js/angular-route.min.js
-    js/angular-sanitize.min.js js/ansi_up.js js/Chart.min.js js/Chart.HorizontalBar.js
-    css/bootstrap.min.css)
+generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue-router.min.js js/vue.min.js
+    js/ansi_up.js js/Chart.min.js js/Chart.HorizontalBar.js css/bootstrap.min.css)
 # (see resources.cpp where these are fetched)

 ## Server
--- a/README.md
+++ b/README.md
@@ -1,11 +1,538 @@
-## laminar
+# Laminar CI

-Laminar is continuous integration with a focus on simplicity and flexibility. Minimal wheels are reinvented. See the [wiki page](https://github.com/ohwgiles/laminar/wiki) for more information
+[Laminar](https://laminar.ohwg.net) is a lightweight and modular Continuous Integration service for Linux. It is self-hosted and developer-friendly, eschewing a configuration web UI in favor of simple version-controllable configuration files and scripts.

-### Features
+Laminar encourages the use of existing GNU/Linux tools such as `bash` and `cron` instead of reinventing them.

-* Pure C++ backend with few dependencies
-* Highly scriptable
-* Filesystem based configuration
-* Simple and responsive web frontend based on bootstrap
+Although the status and progress front-end is very user-friendly, administering a Laminar instance requires writing shell scripts and manually editing configuration files. That being said, there is nothing esoteric here and the tutorial below should be straightforward for anyone with even very basic Linux server administration experience.

+## Getting Started
+
+### Building from source
+
+First install development packages for `capnproto`, `websocketpp`, `sqlite` and `boost-filesystem` from your distribution's repository or other source. Then:
+
+```bash
+git clone https://github.com/ohwgiles/laminar.git
+cd laminar
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/
+make -j4
+sudo make install
+```
+
+`make install` includes a systemd unit file. If you intend to use it, consider creating a new user `laminar` or modifying the user specified in the unit file.
+
+### Installation from binaries
+
+Alternatively to the source-based approach shown above, precompiled packages are supplied for x86_64 Debian Stable and CentOS 7.
+
+Under Debian:
+
+```bash
+wget https://github.com/ohwgiles/laminar/releases/download/0.4/laminar-0.4-1-amd64.deb
+sudo dpkg -i laminar-0.4-1-amd64.deb
+```
+
+Under CentOS:
+
+```bash
+wget https://github.com/ohwgiles/laminar/releases/download/0.4/laminar-0.4-1.x86_64.rpm
+sudo rpm -i laminar-0.4-1.x86_64.rpm
+```
+
+Both install packages will create a new `laminar` user and install (but not activate) a systemd service for launching the laminar daemon.
+
+### Service Configuration
+
+Use `systemctl start laminar` to start the laminar system service and `systemctl enable laminar` to launch it automatically on system boot.
+
+After starting the service, an empty laminar dashboard should be available at http://localhost:8080
+
+Laminar`s configuration file may be found at `/etc/laminar.conf`. Laminar will start with reasonable defaults if no configuration can be found.
+
+#### Running on a different HTTP port or Unix socket
+
+Edit `/etc/laminar.conf` and change `LAMINAR_BIND_HTTP` to `IPADDR:PORT`, `unix:PATH/TO/SOCKET` or `unix-abstract:SOCKETNAME`. `IPADDR` may be `*` to bind on all interfaces. The default is `*:8080`.
+
+Do not attempt to run laminar on port 80. This requires running as `root`, and Laminar will not drop privileges when executing job scripts! For a more complete integrated solution (including SSL), simply run laminar as a reverse proxy behind a regular webserver. For instructions, see for example [NGINX Reverse Proxy](https://www.nginx.com/resources/admin-guide/reverse-proxy/) or [Apache Reverse Proxy](https://httpd.apache.org/docs/2.4/howto/reverse_proxy.html).
+
+#### Set the page title
+
+Change `LAMINAR_TITLE` to your preferred page title.
+
+#### More configuration options
+
+See the [reference section](#reference)
+
+## User Guide
+
+### Terminology
+
+- *job*: a task, identified by a name, comprising of one or more executable scripts.
+- *run*: a numbered execution of a *job*
+
+Throughout this document, the fixed path `/var/lib/laminar` is used. This is simply a default value and can be changed by setting `LAMINAR_HOME` in `/etc/laminar.conf` as desired.
+
+### Creating a job
+
+To create a job that downloads and compiles [GNU Hello](https://www.gnu.org/software/hello/), create the file `/var/lib/laminar/cfg/jobs/hello.run` with the following content:
+
+```bash
+#!/bin/bash -ex
+wget ftp://ftp.gnu.org/gnu/hello/hello-2.10.tar.gz
+tar xzf hello-2.10.tar.gz
+cd hello-2.10
+./configure
+make
+```
+
+Don't forget to mark it executable:
+
+```bash
+chmod +x /var/lib/laminar/cfg/hello.run
+```
+
+### Triggering a run
+
+To trigger a run of the `hello` job, execute
+
+```bash
+laminarc trigger hello
+```
+
+This causes the `/var/lib/laminar/cfg/hello.run` script to be executed, with a working directory of `/var/lib/laminar/run/hello/1`
+
+The results and log output should be visible in the Web UI at http://localhost:8080
+
+#### Triggering a job at a certain time
+
+This is what `cron` is for. To trigger a build of `hello` every day at 0300, add
+
+```
+0 3 * * * LAMINAR_REASON="Nightly build" laminarc trigger hello
+```
+
+to `laminar`'s crontab. For more information about `cron`, see `man crontab`.
+
+`LAMINAR_REASON` is an optional human-readable string that will be displayed in the web UI as the cause of the build.
+
+#### Triggering on a git commit
+
+This is what [git hooks](https://git-scm.com/book/gr/v2/Customizing-Git-Git-Hooks) are for. To create a hook that triggers the `example-build` job when a push is made to the `example` repository, create the file `hooks/post-receive` in the `example.git` bare repository.
+
+```bash
+#!/bin/bash
+LAMINAR_REASON="Push to git repository" laminarc trigger example-build
+```
+
+What if your git server is not the same machine as the laminar instance?
+
+#### Triggering on a remote laminar instance
+
+`laminarc` and `laminard` communicate by default over an [abstract unix socket](http://man7.org/linux/man-pages/man7/unix.7.html). This means that any user **on the same machine** can send commands to the laminar service.
+
+On a trusted network, you might want `laminard` to listen for commands on a TCP port instead. To achieve this, in `/etc/laminar.conf`, set
+
+```
+LAMINAR_BIND_RPC=*:9997
+```
+
+or any interface/port combination you like. This option uses the same syntax as [that for the web UI](#running-on-a-different-http-port-or-unix-socket)
+
+Then, point `laminarc` to the new location using an environment variable:
+
+```bash
+LAMINAR_HOST=192.168.1.1:9997 laminarc trigger example
+```
+
+##### Access control
+
+If you need more flexibility, consider running the communication channel as a regular unix socket and applying user and group permissions to the file. To achieve this, set
+
+```
+LAMINAR_BIND_RPC=unix:/var/run/laminar.sock
+```
+
+or similar path in `/etc/laminar.conf`.
+
+This can be securely and flexibly combined with remote triggering using `ssh`. There is no need to allow the client full shell access to the server machine, the ssh server can restrict certain users to certain commands (in this case `laminarc`). See [the authorized_keys section of the sshd man page](https://man.openbsd.org/sshd#AUTHORIZED_KEYS_FILE_FORMAT) for further information.
+
+### Job chains
+
+A typical pipeline may involve several steps, such as build, test and deploy. Depending on the project, these may be broken up into seperate laminar jobs for maximal flexibility.
+
+The preferred way to accomplish this in Laminar is to use the same method as [regular run triggering](#triggering-a-run), that is, calling `laminarc` directly in your `example.run` scripts.
+
+In addition to `laminarc trigger`, `laminar start` triggers a job run, but waits for its completion and returns a non-zero exit code if the run failed. Furthermore, both `trigger` and `start` will accept multiple jobs in a single invocation:
+
+```bash
+#!/bin/bash -xe
+
+# simultaneously starts example-test-qemu and example-test-target
+# and returns a non-zero error code if either of them fail
+laminarc start example-test-qemu example-test-target
+```
+
+An advantage to using this `laminarc` approach from bash or other scripting language is that it enables highly dynamic pipelines, since you can execute commands like
+
+```bash
+if [ ... ]; then
+  laminarc start example-downstream-special
+else
+  laminarc start example-downstream-regular
+fi
+
+laminarc start example-test-$TARGET_PLATFORM
+```
+
+`laminarc` reads the `$JOB` and `$RUN` variables set by `laminard` and passes them as part of the trigger/start request so the dependency chain can always be traced back.
+
+### Parameterized runs
+
+Any argument passed to `laminarc` of the form `var=value` will be exposed as an environment variable in the corresponding build scripts. For example:
+
+```bash
+laminarc trigger example foo=bar
+```
+
+In `/var/lib/laminar/cfg/jobs/example.run`:
+
+```bash
+#!/bin/bash
+if [ "$foo" == "bar" ]; then
+   ...
+else
+   ...
+fi
+```
+
+### Pre-build actions
+
+If the script `/var/lib/laminar/cfg/jobs/example.before` exists, it will be executed as part of the `example` job, before the primary `/var/lib/laminar/cfg/jobs/example.run` script.
+
+See also [script execution order](#script-execution-order)
+
+#### Passing variables between run scripts
+
+Any script can set environment variables that will stay exposed for subsequent scripts of the same run using `laminarc set`. In `example.before`:
+
+```bash
+#!/bin/bash
+laminarc set foo=bar
+```
+
+Then in `example.run`
+```
+#!/bin/bash
+echo $foo            # prints "bar"
+```
+
+This works because laminarc reads `$JOB` and `$NUM` and passes them to the laminar daemon as part of the `set` request. (It is thus possible to set environment variables on other jobs by overriding these variables, but this is not very useful).
+
+### Post-build actions
+
+Analagously to [Pre-build actions](#pre-build-actions), if the script `/var/lib/laminar/cfg/jobs/example.after` exists, it will be executed after the primary `/var/lib/laminar/cfg/jobs/example.run` script. The `$RESULT` environment variable will contain the run result.
+
+See also [Environment variables](#environment-variables).
+
+#### Archiving artefacts
+
+Laminar's default behaviour is to remove the run directory `/var/lib/laminar/run/JOB/RUN` after its completion. This prevents the typical CI disk usage explosion and encourages the user to judiciously select artefacts for archive.
+
+Laminar provides an archive directory `/var/lib/laminar/archive/JOB/RUN` and exposes its path in `$ARCHIVE`. `example-build.after` might look like this:
+
+```bash
+#!/bin/bash -xe
+cp example.out $ARCHIVE/
+```
+
+This folder structure has been chosen to make it easy for system administrators to host the archive on a separate partition or network drive.
+
+
+#### Conditionally trigger a downstream job
+
+Often, you may wish to only trigger the `example-test` job if the `example-build` job completed successfully. `example-build.after` might look like this:
+
+```bash
+#!/bin/bash -xe
+if [ "$RESULT" == "success" ]; then
+  laminarc trigger example-test
+fi
+```
+
+#### Accessing artifacts from an upstream build
+
+Rather than implementing a separate mechanism for this, the path of the upstream's archive should be passed to the downstream run as a parameter. See [Parameterized runs](#parameterized-runs).
+
+#### Email and IM Notifications
+
+As well as per-job `.after` scripts, a common use case is to send a notification for every job completion. If the global `after` script at `/var/lib/laminar/cfg/after` exists, it will be executed after every job. One way to use this might be:
+
+```bash
+#!/bin/bash -xe
+if [ "$RESULT" != "$LAST_RESULT" ]; then
+  sendmail -t <<EOF
+To: engineering@company.com
+Subject: Laminar $JOB #$RUN: $RESULT
+From: laminar-ci@company.com
+
+Laminar $JOB #$RUN: $RESULT
+EOF
+fi
+```
+
+Of course, you can make this as pretty as you like. A [helper script](#helper-scripts) can be a good choice here.
+
+If you want to send to different addresses dependending on the job, replace `engineering@company.com` above with a variable, e.g. `$RECIPIENTS`, and set `RECIPIENTS=nora@company.com,joe@company.com` in `/var/lib/laminar/cfg/jobs/JOB.env`. See [Environment variables](#environment-variables).
+
+You could also update the `$RECIPIENTS` variable dynamically based on the build itself. For example, if your run script accepts a parameter `$rev` which is a git commit id, as part of your job's `.after` script you could do the following:
+
+```bash
+author_email=$(git show -s --format='%ae' $rev)
+laminarc set RECIPIENTS $author_email
+```
+
+### Helper scripts
+
+The directory `/var/lib/laminar/cfg/scripts` is automatically prepended to the `PATH` of all runs. It is a convenient place to drop executables or scripts to help keep individual job scripts clean and concise. A simple example might be `/var/lib/laminar/cfg/scripts/success_trigger`:
+
+```bash
+#!/bin/bash -e
+if [ "$RESULT" == "success" ]; then
+  laminarc trigger $@
+fi
+```
+
+With this in place, the example shown above in [Conditionally trigger a downstream job](#conditionally-trigger-a-downstream-job) can be simplified to
+
+```bash
+success_trigger example-test
+```
+
+Another excellent candidate for helper scripts is automatically [sending notifications](#email-and-im-notifications) on job status change. See [Example scripts](#appendix--example-scripts) for more useful starting points.
+
+### Data sharing and Workspaces
+
+Often, a job will require a (relatively) large block of (relatively) unchanging data. Examples are a git repository with a long history, or static asset files. Instead of fetching everything from scratch for every run, a job may make use a *workspace*, a per-job folder that is reused between builds.
+
+For example, the following script creates a tarball containing both compiled output and some static asset files from the workspace:
+
+```bash
+#!/bin/bash -ex
+git clone /path/to/sources .
+make
+# Use a hardlink so the arguments to tar will be relative to the CWD
+ln $WORKSPACE/StaticAsset.bin ./
+tar zc a.out StaticAsset.bin > MyProject.tar.gz
+# Archive the artifact (consider moving this to the .after script)
+mv MyProject.tar.gz $ARCHIVE/
+```
+
+For a project with a large git history, it can be more efficient to store the sources in the workspace:
+
+```bash
+#!/bin/bash -ex
+cd $WORKSPACE/myproject
+git pull
+cd -
+
+cmake $WORKSPACE/myproject
+make -j4
+```
+
+**CAUTION**: By default, laminar permits multiple simultaneous runs of the same job. If a job can **modify** the workspace, this might result in inconsistent builds when the job has multiple simultaneous runs. This is unlikely to be an issue for nightly builds, but for SCM-triggered builds it will be. To solve this, use [nodes](#nodes-and-tags) to restrict simultaneous execution of jobs, or [locks](#locks) to temporarily take exclusive control of a resource.
+
+Laminar will automatically create the workspace for a job if it doesn't exist when a job is executed. In this case, the `/var/lib/laminar/cfg/jobs/JOBNAME.init` will be executed if it exists. This is an excellent place to prepare the workspace to a state where subsequent builds can rely on its content.
+
+### Nodes and Tags
+
+In Laminar, a *node* is an abstract concept allowing more fine-grained control over job execution scheduling. Each node can be defined to support an integer number of *executors*, which defines how many runs can be executed simultaneously.
+
+A typical example would be to allow only a few concurrent CPU-intensive jobs (such as compilation), while simultaneously allowing many more less-intensive jobs (such as monitoring or remote jobs). To create a node named `build` with 3 executors, create the file `/var/lib/laminar/cfg/nodes/build.config` with the following content:
+
+```
+EXECUTORS=3
+```
+
+To associate jobs with nodes, laminar uses *tags*. Tags may be applied to nodes and jobs. If a node has tags, only jobs with a matching tag will be executed on it. If a node has no tags, it will accept any job. To tag a node, add them to `/var/lib/laminar/cfg/nodes/NODENAME.conf`:
+
+```
+EXECUTORS=3
+TAGS=tag1,tag2
+```
+
+To add a tag to a job, add the following to `/var/lib/laminar/cfg/jobs/JOBNAME.conf`:
+
+```
+TAGS=tag2
+```
+
+If Laminar cannot find any node configuration, it will assume a single node with 6 executors and no tags.
+
+#### Grouping jobs with tags
+
+Tags are also used to group jobs in the web UI. Each tag will presented as a tab in the "Jobs" page.
+
+#### Node scripts
+
+If `/var/lib/laminar/cfg/nodes/NODENAME.before` exists, it will be executed before the run script of a job scheduled to that node. Similarly, if `/var/lib/laminar/cfg/nodes/NODENAME.after` exists, it will be executed after the run script of a job scheduled to that node.
+
+#### Node environment
+
+If `/var/lib/laminar/cfg/nodes/NODENAME.env` exists and can be parsed as a list of `KEY=VALUE` pairs, these variables will be exposed as part of the run's environment.
+
+### Remote jobs
+
+Laminar provides no specific support, `bash`, `ssh` and possibly NFS are all you need. For example, consider two identical target devices on which test jobs can be run in parallel. You might create a [node](#nodes and tags) for each, `/var/lib/laminar/cfg/nodes/target{1,2}.conf` with a common tag:
+
+```
+EXECUTORS=1
+TAGS=remote-target
+```
+
+In each node's `.env` file, set the individual device's IP address:
+
+```
+TARGET_IP=192.168.0.123
+```
+
+And tag the job accordingly in `/var/lib/laminar/cfg/jobs/myproject-test.conf`:
+
+```
+TAGS=remote-target
+```
+
+This means the job script `/var/lib/laminar/cfg/jobs/myproject-test.run` can be generic:
+
+```bash
+#!/bin/bash -e
+
+ssh root@$TARGET_IP /bin/bash -xe <<"EOF"
+  uname -a
+  ...
+EOF
+scp root@$TARGET_IP:result.xml $ARCHIVE/
+```
+
+Don't forget to add the `laminar` user's public ssh key to the remote's `authorized_keys`.
+
+The call to ssh can itself be hidden with a [helper script](#helper-scripts) `/var/lib/laminar/cfg/scripts/remotebuild`:
+
+```bash
+#!/bin/bash -e
+ssh -E root@$TARGET_IP /bin/bash -xe < $1
+```
+
+Then simply use `#!/usr/bin/env remotebuild` instead of the `#!/bin/bash` hashbang.
+
+### Docker container jobs
+
+Laminar provides no specific support, but just like [remote jobs](#remote-jobs) these are easily implementable in plain bash:
+
+```bash
+#!/bin/bash
+
+docker run --rm -ti -v $PWD:/root -v $WORKSPACE:/ws ubuntu /bin/bash -xe <<EOF
+  git clone http://...
+  ...
+EOF
+```
+
+### Locks
+
+*Locks* are a simple way to control access to shared resources. Any string may be used as a lock name. The command `laminarc lock mylock` locks `mylock`. Subsequent calls to `laminarc lock mylock` will block until `laminarc release mylock` is called a corresponding number of times.
+
+**CAUTION**: Locks are independent of any other job control mechanism in laminar, and will not be released automatically. Making sure calls to lock and release are symmetric is the administrator's responsibility.
+
+An example use builds on the situation described in [Data sharing and Workspaces](#data-sharing-and-workspaces), where a large git repository is stored in the workspace. Conisder this run script:
+
+```bash
+#!/bin/bash -x
+
+# This script expects to be passed the parameter `rev` which
+# should refer to a specific git commit in its source repository.
+# The commit ids could have been read from a server-side
+# post-commit git hook, where many commits could have been pushed
+# at once, but we want to check them all individually. This means
+# this job can be executed several times (with different commit ids)
+# at once.
+
+cd $WORKSPACE
+# Acquire a lock for modifying the workspace
+laminarc lock $JOB-workspace
+# Download all the latest commits
+git fetch
+git checkout $rev
+cd -
+# Fast (hard-link) copy the specific checkout to the build dir
+cp -al $WORKSPACE/src src
+# Release the lock to allow other jobs to do the same
+laminarc release $JOB-workspace
+
+# run the (much longer) build process
+set -e
+cmake src
+make
+```
+
+
+## Reference
+
+### Server options
+
+`laminard` reads the following variables from the environment, which are expected to be sourced by `systemd` from `/etc/laminar.conf`:
+
+- `LAMINAR_HOME`: The directory in which `laminard` should find job configuration and create run directories. Default `/var/lib/laminar`
+- `LAMINAR_BIND_HTTP`: The interface/port or unix socket on which `laminard` should listen for incoming connections to the web frontend. Default `*:8080`
+- `LAMINAR_BIND_RPC`: The interface/port or unix socket on which `laminard` should listen for incoming commands such as build triggers. Default `unix-abstract:laminar`
+- `LAMINAR_TITLE`: The page title to show in the web frontend.
+- `LAMINAR_KEEP_WORKDIR`: If set, do not delete run directories after completion
+- `LAMINAR_ARCHIVE_URL`: If set, the web frontend served by `laminard` will use this URL to form links to artefacts archived jobs. Must be synchronized with web server configuration.
+
+### Script execution order
+
+When `$JOB` is triggered on `$NODE`, the following scripts (relative to `$LAMINAR_HOME/cfg`) may be triggered:
+
+- `jobs/$JOB.init` if the [workspace](#data-sharing-and-workspaces) did not exist
+- `before`
+- `nodes/$NODE.before`
+- `jobs/$JOB.before`
+- `jobs/$JOB.run`
+- `jobs/$JOB.after`
+- `nodes/$NODE.after`
+- `after`
+
+### Environment variables
+
+The following variables are available in run scripts:
+
+- `RUN`
+- `JOB`
+- `RESULT`
+- `LAST_RESULT`
+- `WORKSPACE`
+- `ARCHIVE`
+
+In addition, `$LAMINAR_HOME/cfg/scripts` is prepended to `$PATH`. See [helper scripts](#helper-scripts).
+
+Laminar will also export variables in the form `KEY=VALUE` found in these files:
+
+- `env`
+- `nodes/$NODE.env`
+- `jobs/$JOB.env`
+
+Finally, variables supplied on the command-line call to `laminarc start` or `laminarc trigger` will be available. See [parameterized builds](#parameterized-builds)
+
+### `laminarc`
+
+`laminarc` commands are:
+
+- `trigger [JOB [PARAMS...]]...` triggers one or more jobs with optional parameters, returning immediately.
+- `start [JOB [PARAMS...]]...` triggers one or more jobs with optional parameters and waits for the completion of all jobs. Returns a non-zero error code if any job failed.
+- `set [VARIABLE=VALUE]...` sets one or more variables to be exported in subsequent scripts for the run identified by the `$JOB` and `$RUN` environment variables
+- `lock [NAME]` acquires the [lock](#locks) named `NAME`
+- `release [NAME]` releases the lock named `NAME`
+
+`laminarc` connects to `laminard` using the address supplied by the `LAMINAR_HOST` environment variable. If it is not set, `laminarc` will first attempt to use `LAMINAR_BIND_RPC`, which will be available if `laminarc` is executed from a script within `laminard`. If neither `LAMINAR_HOST` nor `LAMINAR_BIND_RPC` is set, `laminarc` will assume a default host of `unix-abstract:laminar`.
+
+## Appendix: Example scripts
--- a/docker-build-centos.sh
+++ b/docker-build-centos.sh
@@ -1,42 +1,43 @@
 #!/bin/bash

-VERSION=0.2
-
 OUTPUT_DIR=$PWD

 SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))

+VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)
+
 docker run --rm -i -v $SOURCE_DIR:/root/rpmbuild/SOURCES/laminar-$VERSION:ro -v $OUTPUT_DIR:/output centos bash -xe <<EOS

-yum -y install rpm-build cmake make gcc gcc-c++ wget sqlite-devel boost-devel zlib-devel
+yum -y install epel-release
+yum -y install rpm-build cmake3 make gcc gcc-c++ wget sqlite-devel boost-devel zlib-devel

 mkdir /build
 cd /build

-wget -O capnproto.tar.gz https://github.com/sandstorm-io/capnproto/archive/v0.5.3.tar.gz
-wget -O websocketpp.tar.gz https://github.com/zaphoyd/websocketpp/archive/0.6.0.tar.gz
-wget -O rapidjson.tar.gz https://github.com/miloyip/rapidjson/archive/v1.0.2.tar.gz
+wget -O capnproto.tar.gz https://github.com/capnproto/capnproto/archive/7a7c4007e3e1b249f078a246749a584c96bf7503.tar.gz
+wget -O websocketpp.tar.gz https://github.com/zaphoyd/websocketpp/archive/0.7.0.tar.gz
+wget -O rapidjson.tar.gz https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz
 md5sum -c <<EOF
-909bd13ad6b8bc840ac78ab8f5bcb0a4  capnproto.tar.gz
-5a485884c01f881aafbf1e055d851b82  websocketpp.tar.gz
-97cc60d01282a968474c97f60714828c  rapidjson.tar.gz
+58d238ffbb19152f04d2bff520847788  capnproto.tar.gz
+5027c20cde76fdaef83a74acfcf98e23  websocketpp.tar.gz
+badd12c511e081fec6c89c43a7027bce  rapidjson.tar.gz
 EOF

 tar xzf capnproto.tar.gz
 tar xzf websocketpp.tar.gz
 tar xzf rapidjson.tar.gz

-cd /build/capnproto-0.5.3/c++/
-cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=off .
+cd /build/capnproto-7a7c4007e3e1b249f078a246749a584c96bf7503/c++/
+cmake3 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=off .
 make -j4
 make install

-cd /build/websocketpp-0.6.0/
-cmake .
+cd /build/websocketpp-0.7.0/
+cmake3 .
 make install

-cd /build/rapidjson-1.0.2/
-cmake -DRAPIDJSON_BUILD_EXAMPLES=off .
+cd /build/rapidjson-1.1.0/
+cmake3 -DRAPIDJSON_BUILD_EXAMPLES=off .
 make install

 cd
@@ -55,7 +56,7 @@ Lightweight Continuous Integration Service
 %prep

 %build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ %{_sourcedir}/laminar-$VERSION
+cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ %{_sourcedir}/laminar-$VERSION
 pwd
 make

--- a/docker-build-debian.sh
+++ b/docker-build-debian.sh
@@ -1,42 +1,42 @@
 #!/bin/bash

-VERSION=0.2
-
 OUTPUT_DIR=$PWD

 SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))

-docker run --rm -i -v $SOURCE_DIR:/laminar:ro -v $OUTPUT_DIR:/output ubuntu bash -xe <<EOS
+VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)
+
+docker run --rm -i -v $SOURCE_DIR:/laminar:ro -v $OUTPUT_DIR:/output debian:stable bash -xe <<EOS

 apt-get update
-apt-get install -y wget cmake g++ libsqlite3-dev libboost-filesystem1.55-dev zlib1g-dev
+apt-get install -y wget cmake g++ libsqlite3-dev libboost-filesystem1.62-dev zlib1g-dev

 mkdir /build
 cd /build

-wget -O capnproto.tar.gz https://github.com/sandstorm-io/capnproto/archive/v0.5.3.tar.gz
-wget -O websocketpp.tar.gz https://github.com/zaphoyd/websocketpp/archive/0.6.0.tar.gz
-wget -O rapidjson.tar.gz https://github.com/miloyip/rapidjson/archive/v1.0.2.tar.gz
+wget -O capnproto.tar.gz https://github.com/capnproto/capnproto/archive/7a7c4007e3e1b249f078a246749a584c96bf7503.tar.gz
+wget -O websocketpp.tar.gz https://github.com/zaphoyd/websocketpp/archive/0.7.0.tar.gz
+wget -O rapidjson.tar.gz https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz
 md5sum -c <<EOF
-909bd13ad6b8bc840ac78ab8f5bcb0a4  capnproto.tar.gz
-5a485884c01f881aafbf1e055d851b82  websocketpp.tar.gz
-97cc60d01282a968474c97f60714828c  rapidjson.tar.gz
+58d238ffbb19152f04d2bff520847788  capnproto.tar.gz
+5027c20cde76fdaef83a74acfcf98e23  websocketpp.tar.gz
+badd12c511e081fec6c89c43a7027bce  rapidjson.tar.gz
 EOF

 tar xzf capnproto.tar.gz
 tar xzf websocketpp.tar.gz
 tar xzf rapidjson.tar.gz

-cd /build/capnproto-0.5.3/c++/
+cd /build/capnproto-7a7c4007e3e1b249f078a246749a584c96bf7503/c++/
 cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=off .
 make -j4
 make install

-cd /build/websocketpp-0.6.0/
+cd /build/websocketpp-0.7.0/
 cmake .
 make install

-cd /build/rapidjson-1.0.2/
+cd /build/rapidjson-1.1.0/
 cmake -DRAPIDJSON_BUILD_EXAMPLES=off .
 make install

@@ -54,7 +54,7 @@ Section:
 Priority: optional
 Architecture: amd64
 Maintainer: Oliver Giles <web ohwg net>
-Depends: libboost-filesystem1.55.0, zlib1g
+Depends: libboost-filesystem1.62.0, zlib1g
 Description: Lightweight Continuous Integration Service
 EOF
 cat <<EOF > laminar/DEBIAN/postinst
@@ -67,5 +67,5 @@ EOF
 chmod +x laminar/DEBIAN/postinst

 dpkg-deb --build laminar
-mv laminar.deb /output/laminar_$VERSION-1_amd64.deb
+mv laminar.deb /output/laminar-$VERSION-1-amd64.deb
 EOS
--- a/laminar.conf
+++ b/laminar.conf
@@ -8,6 +8,23 @@
 ###
 #LAMINAR_HOME=/var/lib/laminar

+### LAMINAR_BIND_HTTP
+###
+### Interface on which laminard will bind to serve the Web UI.
+### May be of the form IP:PORT, unix:PATH/TO/SOCKET or unix-abstract:NAME
+###
+### Default: *:8080
+###
+#LAMINAR_BIND_HTTP=*:8080
+
+### LAMINAR_BIND_RPC
+###
+### Interface on which laminard will bind to accept RPC from laminarc.
+### May be of the form IP:PORT, unix:PATH/TO/SOCKET or unix-abstract:NAME
+###
+### Default: unix-abstract:laminar
+#LAMINAR_BIND_RPC=unix-abstract:laminar
+
 ###
 ### LAMINAR_TITLE
 ###
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -38,8 +38,8 @@ static int setParams(int argc, char** argv, T& request) {

    int argsConsumed = n;

-    char* job = getenv("lJobName");
-    char* num = getenv("lBuildNum");
+    char* job = getenv("JOB");
+    char* num = getenv("RUN");
    char* reason = getenv("LAMINAR_REASON");

    if(job && num) n+=2;
@@ -71,15 +71,13 @@ static int setParams(int argc, char** argv, T& request) {
 }

 int main(int argc, char** argv) {
-    // TODO: pass this through an enviroment variable set by laminard
-    const char* address = "unix:\0laminar";
-
    if(argc < 2) {
        fprintf(stderr, "Usage: %s <command> [parameters...]\n", argv[0]);
        return EINVAL;
    }

    int ret = 0;
+    const char* address = getenv("LAMINAR_HOST") ?: getenv("LAMINAR_BIND_RPC") ?: "unix-abstract:laminar";

    capnp::EzRpcClient client(address);
    LaminarCi::Client laminar = client.getMain<LaminarCi>();
@@ -136,8 +134,8 @@ int main(int argc, char** argv) {
        }
        auto req = laminar.setRequest();
        char* eq = strchr(argv[2], '=');
-        char* job = getenv("lJobName");
-        char* num = getenv("lBuildNum");
+        char* job = getenv("JOB");
+        char* num = getenv("RUN");
        if(job && num && eq) {
            char* name = argv[2];
            *eq++ = '\0';
@@ -148,16 +146,17 @@ int main(int argc, char** argv) {
            req.getParam().setValue(val);
            req.send().wait(waitScope);
        } else {
-            fprintf(stderr, "Missing lJobName and lBuildNum or param is not in the format key=value\n");
+            fprintf(stderr, "Missing $JOB or $RUN or param is not in the format key=value\n");
            return EINVAL;
        }
-    } else if(strcmp(argv[1], "wait") == 0) {
-        auto req = laminar.pendRequest();
-        req.setJobName(argv[2]);
-        req.setBuildNum(atoi(argv[3]));
-        auto response = req.send().wait(waitScope);
-        if(response.getResult() != LaminarCi::JobResult::SUCCESS)
-            return EFAILED;
+    } else if(strcmp(argv[1], "lock") == 0) {
+        auto req = laminar.lockRequest();
+        req.setLockName(argv[2]);
+        req.send().wait(waitScope);
+    } else if(strcmp(argv[1], "release") == 0) {
+        auto req = laminar.releaseRequest();
+        req.setLockName(argv[2]);
+        req.send().wait(waitScope);
    } else {
        fprintf(stderr, "Unknown comand %s\n", argv[1]);
        return EINVAL;
--- a/src/conf.cpp
+++ b/src/conf.cpp
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
--- a/src/database.cpp
+++ b/src/database.cpp
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -50,14 +50,14 @@ void Database::Statement::bindValue(int i, const char* e) {
    sqlite3_bind_text(stmt, i, e, -1, NULL);
 }

-void Database::Statement::bindValue(int i, std::string e) {
-    sqlite3_bind_blob(stmt, i, e.data(), e.size(), NULL);
+void Database::Statement::bindValue(int i, const std::string& e) {
+    sqlite3_bind_text(stmt, i, e.data(), e.size(), NULL);
 }

 template<> std::string Database::Statement::fetchColumn(int col) {
    int sz = sqlite3_column_bytes(stmt, col);
    std::string res(sz, '\0');
-    memcpy(&res[0], sqlite3_column_blob(stmt, col), sz);
+    memcpy(&res[0], sqlite3_column_text(stmt, col), sz);
    return res;
 }

--- a/src/database.h
+++ b/src/database.h
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -55,9 +55,12 @@ private:
        ~Statement();

        // Bind several parameters in a single call. They are bound
-        // by index in the order passed into this function
+        // by index in the order passed into this function. Must be
+        // passed by reference because arguments may be std::strings,
+        // which must be passed by reference because sqlite requires
+        // the bound string's lifetime to exist until sqlite3_step
        template<typename...Args>
-        Statement& bind(Args...args) {
+        Statement& bind(const Args&...args) {
            return bindRecursive<Args...>(1, args...);
        }
        // Fetch columns. Supply a callback that will be executed for
@@ -100,7 +103,7 @@ private:
        bool row();

        template<typename T, typename...Args>
-        Statement& bindRecursive(int i, T v, Args...args) {
+        Statement& bindRecursive(int i, const T& v, const Args&...args) {
            bindValue(i, v); // specialization must exist for T
            return bindRecursive(i + 1, args...);
        }
@@ -112,7 +115,7 @@ private:
        // Bind value specializations
        void bindValue(int i, int e);
        void bindValue(int i, const char* e);
-        void bindValue(int i, std::string e);
+        void bindValue(int i, const std::string& e);

        // Declaration for fetch column interface,
        // intentionally missing definition
--- a/src/interface.h
+++ b/src/interface.h
@@ -21,8 +21,6 @@

 #include "run.h"

-#include <kj/async.h>
-
 #include <string>
 #include <memory>
 #include <unordered_map>
@@ -73,6 +71,13 @@ struct LaminarClient {
    MonitorScope scope;
 };

+// Represents a (rpc) client that wants to be notified about run completion.
+// Pass instances of this to LaminarInterface registerWaiter and
+// deregisterWaiter
+struct LaminarWaiter {
+    virtual void complete(const Run*) = 0;
+};
+
 // The interface connecting the network layer to the application business
 // logic. These methods fulfil the requirements of both the HTTP/Websocket
 // and RPC interfaces.
@@ -81,15 +86,6 @@ struct LaminarInterface {
    // the supplied name is not a known job.
    virtual std::shared_ptr<Run> queueJob(std::string name, ParamMap params = ParamMap()) = 0;

-    // Returns a promise that will wait for a run matching the given name
-    // and build number to complete. The promise will resolve to the result
-    // of the run. If no such run exists, the status will be RunState::UNKNOWN
-    virtual kj::Promise<RunState> waitForRun(std::string name, int buildNum) = 0;
-
-    // Specialization of above for an existing Run object (for example returned
-    // from queueJob). Returned promise will never resolve to RunState::UNKNOWN
-    virtual kj::Promise<RunState> waitForRun(const Run*) = 0;
-
    // Register a client (but don't give up ownership). The client will be
    // notified with a JSON message of any events matching its scope
    // (see LaminarClient and MonitorScope above)
@@ -99,6 +95,14 @@ struct LaminarInterface {
    // to call LaminarClient::sendMessage on invalid data
    virtual void deregisterClient(LaminarClient* client) = 0;

+    // Register a waiter (but don't give up ownership). The waiter will be
+    // notified with a callback of any run completion (see LaminarWaiter above)
+    virtual void registerWaiter(LaminarWaiter* waiter) = 0;
+
+    // Call this before destroying a waiter so that Laminar doesn't try
+    // to call LaminarWaiter::complete on invalid data
+    virtual void deregisterWaiter(LaminarWaiter* waiter) = 0;
+
    // Synchronously send a snapshot of the current status to the given
    // client (as governed by the client's MonitorScope). This is called on
    // initial websocket connect.
--- a/src/laminar.capnp
+++ b/src/laminar.capnp
@@ -4,8 +4,9 @@ interface LaminarCi {

    trigger @0 (jobName :Text, params :List(JobParam)) -> (result :MethodResult);
    start @1 (jobName :Text, params :List(JobParam)) -> (result :JobResult);
-    pend @2 (jobName :Text, buildNum :UInt32) -> (result :JobResult);
-    set @3 (jobName :Text, buildNum :UInt32, param :JobParam) -> (result :MethodResult);
+    set @2 (jobName :Text, buildNum :UInt32, param :JobParam) -> (result :MethodResult);
+    lock @3 (lockName :Text) -> ();
+    release @4 (lockName :Text) -> ();

    struct JobParam {
        name @0 :Text;
--- a/src/laminar.cpp
+++ b/src/laminar.cpp
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -22,12 +22,15 @@
 #include "log.h"

 #include <sys/wait.h>
+#include <sys/signalfd.h>
 #include <fstream>
 #include <zlib.h>

 #include <boost/filesystem.hpp>
 namespace fs = boost::filesystem;

+#define COMPRESS_LOG_MIN_SIZE 1024
+
 #include <rapidjson/stringbuffer.h>
 #include <rapidjson/writer.h>

@@ -52,11 +55,18 @@ template<> Json& Json::set(const char* key, time_t value) { String(key); Int64(v

 namespace {
 // Default values when none were supplied in $LAMINAR_CONF_FILE (/etc/laminar.conf)
-constexpr const char* INTADDR_RPC_DEFAULT = "unix:\0laminar";
+constexpr const char* INTADDR_RPC_DEFAULT = "unix-abstract:laminar";
 constexpr const char* INTADDR_HTTP_DEFAULT = "*:8080";
 constexpr const char* ARCHIVE_URL_DEFAULT = "/archive";
 }

+// helper for appending to boost::filesystem::path
+fs::path operator+(fs::path p, const char* ext) {
+    std::string leaf = p.leaf().string();
+    leaf += ext;
+    return p.remove_leaf()/leaf;
+}
+
 typedef std::string str;

 Laminar::Laminar() {
@@ -98,6 +108,14 @@ void Laminar::deregisterClient(LaminarClient* client) {
    clients.erase(client);
 }

+void Laminar::registerWaiter(LaminarWaiter *waiter) {
+    waiters.insert(waiter);
+}
+
+void Laminar::deregisterWaiter(LaminarWaiter *waiter) {
+    waiters.erase(waiter);
+}
+
 bool Laminar::setParam(std::string job, int buildNum, std::string param, std::string value) {
    if(Run* run = activeRun(job, buildNum)) {
        run->params[param] = value;
@@ -131,14 +149,18 @@ void Laminar::sendStatus(LaminarClient* client) {
        } else { // it must be finished, fetch it from the database
            db->stmt("SELECT output, outputLen FROM builds WHERE name = ? AND number = ?")
              .bind(client->scope.job, client->scope.num)
-              .fetch<str,int>([=](str zipped, unsigned long sz) {
+              .fetch<str,int>([=](str maybeZipped, unsigned long sz) {
                std::string log(sz+1,'\0');
-                int res = ::uncompress((unsigned char*)&log[0], &sz,
-                        (unsigned char*)zipped.data(), zipped.size());
-                if(res == Z_OK)
-                    client->sendMessage(log);
-                else
-                    LLOG(ERROR, "Failed to uncompress log", res);
+                if(sz >= COMPRESS_LOG_MIN_SIZE) {
+                    int res = ::uncompress((unsigned char*)&log[0], &sz,
+                         (unsigned char*)maybeZipped.data(), maybeZipped.size());
+                    if(res == Z_OK)
+                        client->sendMessage(log);
+                    else
+                        LLOG(ERROR, "Failed to uncompress log");
+                } else {
+                    client->sendMessage(maybeZipped);
+                }
            });
        }
        return;
@@ -146,8 +168,8 @@ void Laminar::sendStatus(LaminarClient* client) {

    Json j;
    j.set("type", "status");
+    j.set("title", getenv("LAMINAR_TITLE") ?: "Laminar");
    j.startObject("data");
-    j.set("title", getenv("LAMINAR_TITLE") ?: "");
    if(client->scope.type == MonitorScope::RUN) {
        db->stmt("SELECT queuedAt,startedAt,completedAt, result, reason FROM builds WHERE name = ? AND number = ?")
        .bind(client->scope.job, client->scope.num)
@@ -166,8 +188,8 @@ void Laminar::sendStatus(LaminarClient* client) {
            j.set("result", to_string(RunState::RUNNING));
            db->stmt("SELECT completedAt - startedAt FROM builds WHERE name = ? ORDER BY completedAt DESC LIMIT 1")
             .bind(run->name)
-             .fetch<int>([&](int etc){
-                j.set("etc", time(0) + etc);
+             .fetch<int>([&](int lastRuntime){
+                j.set("etc", run->startedAt + lastRuntime);
            });
        }
        j.set("latestNum", int(buildNums[client->scope.job]));
@@ -261,8 +283,8 @@ void Laminar::sendStatus(LaminarClient* client) {
            j.set("started", run->startedAt);
            db->stmt("SELECT completedAt - startedAt FROM builds WHERE name = ? ORDER BY completedAt DESC LIMIT 1")
             .bind(run->name)
-             .fetch<int>([&](int etc){
-                j.set("etc", time(0) + etc);
+             .fetch<int>([&](int lastRuntime){
+                j.set("etc", run->startedAt + lastRuntime);
            });
            j.EndObject();
        }
@@ -326,6 +348,19 @@ void Laminar::run() {

    srv = new Server(*this, listen_rpc, listen_http);

+    // handle SIGCHLD
+    sigset_t mask;
+    sigemptyset(&mask);
+    sigaddset(&mask, SIGCHLD);
+    sigprocmask(SIG_BLOCK, &mask, NULL);
+    int sigchld = signalfd(-1, &mask, 0);
+    srv->addDescriptor(sigchld, [this](char* buf, size_t sz){
+        struct signalfd_siginfo* siginfo = (struct signalfd_siginfo*) buf;
+        KJ_ASSERT(siginfo->ssi_signo == SIGCHLD);
+        reapAdvance();
+        assignNewJobs();
+    });
+
    srv->start();
 }

@@ -344,26 +379,22 @@ bool Laminar::loadConfiguration() {

    if(fs::is_directory(nodeCfg)) {
        for(fs::directory_iterator it(nodeCfg); it != fs::directory_iterator(); ++it) {
-            if(!fs::is_directory(it->status()))
+            if(!fs::is_regular_file(it->status()) || it->path().extension() != ".conf")
                continue;

-            fs::directory_entry config(it->path()/"config");
-            if(!fs::is_regular_file(config.status()))
-                continue;
-
-            StringMap conf = parseConfFile(config.path().string().c_str());
+            StringMap conf = parseConfFile(it->path().string().c_str());

            Node node;
-            node.name = it->path().filename().string();
+            node.name = it->path().stem().string();
            node.numExecutors = conf.get<int>("EXECUTORS", 6);

            std::string tags = conf.get<std::string>("TAGS");
            if(!tags.empty()) {
                std::istringstream iss(tags);
                std::set<std::string> tagList;
-                std::copy(std::istream_iterator<std::string>(iss),
-                          std::istream_iterator<std::string>(),
-                          std::inserter(tagList, tagList.begin()));
+                std::string tag;
+                while(std::getline(iss, tag, ','))
+                    tagList.insert(tag);
                node.tags = tagList;
            }

@@ -384,23 +415,19 @@ bool Laminar::loadConfiguration() {
    fs::path jobsDir = fs::path(homeDir)/"cfg"/"jobs";
    if(fs::is_directory(jobsDir)) {
        for(fs::directory_iterator it(jobsDir); it != fs::directory_iterator(); ++it) {
-            if(!fs::is_directory(it->status()))
+            if(!fs::is_regular_file(it->status()) || it->path().extension() != ".conf")
                continue;

-            fs::directory_entry config(it->path()/"config");
-            if(!fs::is_regular_file(config.status()))
-                continue;
-
-            StringMap conf = parseConfFile(config.path().string().c_str());
+            StringMap conf = parseConfFile(it->path().string().c_str());

            std::string tags = conf.get<std::string>("TAGS");
            if(!tags.empty()) {
                std::istringstream iss(tags);
                std::set<std::string> tagList;
-                std::copy(std::istream_iterator<std::string>(iss),
-                          std::istream_iterator<std::string>(),
-                          std::inserter(tagList, tagList.begin()));
-                jobTags[it->path().filename().string()] = tagList;
+                std::string tag;
+                while(std::getline(iss, tag, ','))
+                    tagList.insert(tag);
+                jobTags[it->path().stem().string()] = tagList;
            }

        }
@@ -410,19 +437,11 @@ bool Laminar::loadConfiguration() {
 }

 std::shared_ptr<Run> Laminar::queueJob(std::string name, ParamMap params) {
-    if(!fs::exists(fs::path(homeDir)/"cfg"/"jobs"/name)) {
+    if(!fs::exists(fs::path(homeDir)/"cfg"/"jobs"/name+".run")) {
        LLOG(ERROR, "Non-existent job", name);
        return nullptr;
    }

-    // attempt to create a workspace for this job if it doesn't exist
-    if(!fs::exists(fs::path(homeDir)/"run"/name/"workspace")) {
-        if(!fs::create_directories(fs::path(homeDir)/"run"/name/"workspace")) {
-            LLOG(ERROR, "Could not create job workspace", name);
-            return nullptr;
-        }
-    }
-
    std::shared_ptr<Run> run = std::make_shared<Run>();
    run->name = name;
    run->queuedAt = time(0);
@@ -460,52 +479,38 @@ std::shared_ptr<Run> Laminar::queueJob(std::string name, ParamMap params) {
    return run;
 }

-kj::Promise<RunState> Laminar::waitForRun(std::string name, int buildNum) {
-    if(const Run* run = activeRun(name, buildNum))
-        return waitForRun(run);
-    return RunState::UNKNOWN;
-}
-
-kj::Promise<RunState> Laminar::waitForRun(const Run* run) {
-    waiters[run].emplace_back(Waiter{});
-    return waiters[run].back().takePromise();
-}
-
 bool Laminar::stepRun(std::shared_ptr<Run> run) {
    bool complete = run->step();
    if(!complete) {
-        srv->addProcess(run->fd, [=](char* b,size_t n){
+        srv->addDescriptor(run->fd, [=](char* b,size_t n){
            std::string s(b,n);
            run->log += s;
            for(LaminarClient* c : clients) {
                if(c->scope.wantsLog(run->name, run->build))
                    c->sendMessage(s);
            }
-        }, [this,run](){ reapAdvance();});
+        });
    }
    return complete;
 }

+// Reaps a zombie and steps the corresponding Run to its next state.
+// Should be called on SIGCHLD
 void Laminar::reapAdvance() {
    int ret = 0;
-    // TODO: If we pass WNOHANG here for better asynchronicity, how do
-    // we re-schedule a poll to wait for finished child processes?
-    pid_t pid = waitpid(-1, &ret, 0);
-    // TODO: handle signalled child processes
-    if(pid > 0) {
+    pid_t pid;
+    while((pid = waitpid(-1, &ret, WNOHANG)) > 0) {
        LLOG(INFO, "Reaping", pid);
        auto it = activeJobs.get<0>().find(pid);
        std::shared_ptr<Run> run = *it;
        bool completed = true;
        activeJobs.get<0>().modify(it, [&](std::shared_ptr<Run> run){
-            close(run->fd);
            run->reaped(ret);
            completed = stepRun(run);
        });
        if(completed)
            run->complete();
    }
-    assignNewJobs();
 }

 bool Laminar::nodeCanQueue(const Node& node, const Run& run) const {
@@ -513,16 +518,16 @@ bool Laminar::nodeCanQueue(const Node& node, const Run& run) const {
    if(node.busyExecutors >= node.numExecutors)
        return false;

-    auto it = jobTags.find(run.name);
-    // if both nodes have no tags, it's OK
-    if(it == jobTags.end() && node.tags.size() == 0)
+    // if the node has no tags, allow the build
+    if(node.tags.size() == 0)
        return true;

-    // but if just one of them does, don't allow the build
-    if(it == jobTags.end() || node.tags.size() == 0)
+    auto it = jobTags.find(run.name);
+    // if the job has no tags, it cannot be run on this node
+    if(it == jobTags.end())
        return false;

-    // in other cases, allow the build if they have a tag in common
+    // otherwise, allow the build if job and node have a tag in common
    for(const std::string& tag : it->second) {
        if(node.tags.find(tag) != node.tags.end())
            return true;
@@ -539,15 +544,29 @@ void Laminar::assignNewJobs() {
            Node& node = sn.second;
            std::shared_ptr<Run> run = *it;
            if(nodeCanQueue(node, *run)) {
+                fs::path cfgDir = fs::path(homeDir)/"cfg";
+
+                // create a workspace for this job if it doesn't exist
+                fs::path ws = fs::path(homeDir)/"run"/run->name/"workspace";
+                if(!fs::exists(ws)) {
+                    if(!fs::create_directories(ws)) {
+                        LLOG(ERROR, "Could not create job workspace", run->name);
+                        break;
+                    }
+                    // prepend the workspace init script
+                    if(fs::exists(cfgDir/"jobs"/run->name+".init"))
+                        run->addScript((cfgDir/"jobs"/run->name+".init").string(), ws.string());
+                }

                int buildNum = buildNums[run->name] + 1;
-                // create a working directory (different to a workspace!)
-                fs::path wd = fs::path(homeDir)/"run"/run->name/std::to_string(buildNum);
-                if(!fs::create_directory(wd)) {
-                    LLOG(ERROR, "Could not create working directory", wd.string());
+                // create the run directory
+                fs::path rd = fs::path(homeDir)/"run"/run->name/std::to_string(buildNum);
+                if(!fs::create_directory(rd)) {
+                    LLOG(ERROR, "Could not create working directory", rd.string());
                    break;
                }
-                run->wd = wd.string();
+                run->runDir = rd.string();
+
                // create an archive directory
                fs::path archive = fs::path(homeDir)/"archive"/run->name/std::to_string(buildNum);
                if(fs::is_directory(archive)) {
@@ -558,24 +577,23 @@ void Laminar::assignNewJobs() {
                }

                // add scripts
-                fs::path cfgDir = fs::path(homeDir)/"cfg";
                // global before-run script
                if(fs::exists(cfgDir/"before"))
                    run->addScript((cfgDir/"before").string());
                // per-node before-run script
-                if(fs::exists(cfgDir/"nodes"/node.name/"before"))
-                    run->addScript((cfgDir/"before").string());
+                if(fs::exists(cfgDir/"nodes"/node.name+".before"))
+                    run->addScript((cfgDir/"nodes"/node.name+".before").string());
                // job before-run script
-                if(fs::exists(cfgDir/"jobs"/run->name/"before"))
-                    run->addScript((cfgDir/"jobs"/run->name/"before").string());
+                if(fs::exists(cfgDir/"jobs"/run->name+".before"))
+                    run->addScript((cfgDir/"jobs"/run->name+".before").string());
                // main run script. must exist.
-                run->addScript((cfgDir/"jobs"/run->name/"run").string());
+                run->addScript((cfgDir/"jobs"/run->name+".run").string());
                // job after-run script
-                if(fs::exists(cfgDir/"jobs"/run->name/"after"))
-                    run->addScript((cfgDir/"jobs"/run->name/"after").string());
+                if(fs::exists(cfgDir/"jobs"/run->name+".after"))
+                    run->addScript((cfgDir/"jobs"/run->name+".after").string());
                // per-node after-run script
-                if(fs::exists(cfgDir/"nodes"/node.name/"after"))
-                    run->addScript((cfgDir/"nodes"/node.name/"after").string());
+                if(fs::exists(cfgDir/"nodes"/node.name+".after"))
+                    run->addScript((cfgDir/"nodes"/node.name+".after").string());
                // global after-run script
                if(fs::exists(cfgDir/"after"))
                    run->addScript((cfgDir/"after").string());
@@ -583,10 +601,10 @@ void Laminar::assignNewJobs() {
                // add environment files
                if(fs::exists(cfgDir/"env"))
                    run->addEnv((cfgDir/"env").string());
-                if(fs::exists(cfgDir/"nodes"/node.name/"env"))
-                    run->addEnv((cfgDir/"nodes"/node.name/"env").string());
-                if(fs::exists(cfgDir/"jobs"/run->name/"env"))
-                    run->addEnv((cfgDir/"jobs"/run->name/"env").string());
+                if(fs::exists(cfgDir/"nodes"/node.name+".env"))
+                    run->addEnv((cfgDir/"nodes"/node.name+".env").string());
+                if(fs::exists(cfgDir/"jobs"/run->name+".env"))
+                    run->addEnv((cfgDir/"jobs"/run->name+".env").string());

                // start the job
                node.busyExecutors++;
@@ -662,16 +680,22 @@ void Laminar::runFinished(Run * r) {
    time_t completedAt = time(0);

    // compress log
-    std::string zipped(r->log.size(), '\0');
+    std::string maybeZipped = r->log;
    size_t logsize = r->log.length();
-    size_t zippedSize = zipped.size();
-    ::compress((unsigned char*)&zipped[0], &zippedSize,
-            (unsigned char*)&r->log[0], logsize);
-    zipped.resize(zippedSize);
+    if(r->log.length() >= COMPRESS_LOG_MIN_SIZE) {
+        std::string zipped(r->log.size(), '\0');
+        size_t zippedSize = zipped.size();
+        if(::compress((unsigned char*)&zipped[0], &zippedSize,
+            (unsigned char*)&r->log[0], logsize) == Z_OK) {
+            zipped.resize(zippedSize);
+            std::swap(maybeZipped, zipped);
+        }
+    }

+    std::string reason = r->reason();
    db->stmt("INSERT INTO builds VALUES(?,?,?,?,?,?,?,?,?,?,?,?)")
     .bind(r->name, r->build, node->name, r->queuedAt, r->startedAt, completedAt, int(r->result),
-           zipped, logsize, r->parentName, r->parentBuild, r->reason())
+           maybeZipped, logsize, r->parentName, r->parentBuild, reason)
     .exec();

    // notify clients
@@ -696,13 +720,13 @@ void Laminar::runFinished(Run * r) {
            c->sendMessage(msg);
    }

-    // wake the waiters
-    for(Waiter& waiter : waiters[r])
-        waiter.release(r->result);
-    waiters.erase(r);
+    // notify the waiters
+    for(LaminarWaiter* w : waiters) {
+        w->complete(r);
+    }

-    // remove the workdir
-    fs::remove_all(r->wd);
+    // remove the rundir
+    fs::remove_all(r->runDir);

    // will delete the job
    activeJobs.get<2>().erase(r);
--- a/src/laminar.h
+++ b/src/laminar.h
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -36,7 +36,7 @@ class Json;
 // It owns a Server to manage the HTTP/websocket and Cap'n Proto RPC
 // interfaces and communicates via the LaminarInterface methods and
 // the LaminarClient objects (see interface.h)
-class Laminar : public LaminarInterface {
+class Laminar final : public LaminarInterface {
 public:
    Laminar();
    ~Laminar();
@@ -48,10 +48,11 @@ public:

    // Implementations of LaminarInterface
    std::shared_ptr<Run> queueJob(std::string name, ParamMap params = ParamMap()) override;
-    kj::Promise<RunState> waitForRun(std::string name, int buildNum) override;
-    kj::Promise<RunState> waitForRun(const Run* run) override;
    void registerClient(LaminarClient* client) override;
    void deregisterClient(LaminarClient* client) override;
+    void registerWaiter(LaminarWaiter* waiter) override;
+    void deregisterWaiter(LaminarWaiter* waiter) override;
+
    void sendStatus(LaminarClient* client) override;
    bool setParam(std::string job, int buildNum, std::string param, std::string value) override;
    bool getArtefact(std::string path, std::string& result) override;
@@ -73,19 +74,6 @@ private:

    std::list<std::shared_ptr<Run>> queuedJobs;

-    // Implements the waitForRun API.
-    // TODO: refactor
-    struct Waiter {
-        Waiter() : paf(kj::newPromiseAndFulfiller<RunState>()) {}
-        void release(RunState state) {
-            paf.fulfiller->fulfill(RunState(state));
-        }
-        kj::Promise<RunState> takePromise() { return std::move(paf.promise); }
-    private:
-        kj::PromiseFulfillerPair<RunState> paf;
-    };
-    std::unordered_map<const Run*,std::list<Waiter>> waiters;
-
    std::unordered_map<std::string, uint> buildNums;

    std::unordered_map<std::string, std::set<std::string>> jobTags;
@@ -96,6 +84,7 @@ private:
    NodeMap nodes;
    std::string homeDir;
    std::set<LaminarClient*> clients;
+    std::set<LaminarWaiter*> waiters;
    bool eraseWorkdir;
    std::string archiveUrl;
 };
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -21,8 +21,11 @@

 #include <signal.h>

-std::function<void()> sigHandler;
-static void __sigHandler(int) { sigHandler(); }
+static Laminar* laminar;
+
+static void laminar_quit(int) {
+    laminar->stop();
+}

 int main(int argc, char** argv) {
    for(int i = 1; i < argc; ++i) {
@@ -31,19 +34,14 @@ int main(int argc, char** argv) {
        }
    }

-    do {
-        Laminar laminar;
-        sigHandler = [&](){
-            LLOG(INFO, "Received SIGINT");
-            laminar.stop();
-        };
-        signal(SIGINT, &__sigHandler);
-        signal(SIGTERM, &__sigHandler);
+    laminar = new Laminar;

-        laminar.run();
-    } while(false);
+    signal(SIGINT, &laminar_quit);
+    signal(SIGTERM, &laminar_quit);
+    laminar->run();

-    LLOG(INFO, "end of main");
+    delete laminar;
+
+    LLOG(INFO, "Clean exit");
    return 0;
 }
-
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -30,18 +30,13 @@ Resources::Resources()
    INIT_RESOURCE("/", index_html);
    INIT_RESOURCE("/favicon.ico", favicon_ico);
    INIT_RESOURCE("/favicon-152.png", favicon_152_png);
-    INIT_RESOURCE("/progress.png", progress_png);
+    INIT_RESOURCE("/progress.gif", progress_gif);
    INIT_RESOURCE("/icon.png", icon_png);
    INIT_RESOURCE("/js/app.js", js_app_js);
    INIT_RESOURCE("/js/Chart.HorizontalBar.js", js_Chart_HorizontalBar_js);
    INIT_RESOURCE("/js/ansi_up.js", js_ansi_up_js);
-    INIT_RESOURCE("/tpl/home.html", tpl_home_html);
-    INIT_RESOURCE("/tpl/job.html", tpl_job_html);
-    INIT_RESOURCE("/tpl/run.html", tpl_run_html);
-    INIT_RESOURCE("/tpl/browse.html", tpl_browse_html);
-    INIT_RESOURCE("/js/angular.min.js", js_angular_min_js);
-    INIT_RESOURCE("/js/angular-route.min.js", js_angular_route_min_js);
-    INIT_RESOURCE("/js/angular-sanitize.min.js", js_angular_sanitize_min_js);
+    INIT_RESOURCE("/js/vue.min.js", js_vue_min_js);
+    INIT_RESOURCE("/js/vue-router.min.js", js_vue_router_min_js);
    INIT_RESOURCE("/js/ansi_up.js", js_ansi_up_js);
    INIT_RESOURCE("/js/Chart.min.js", js_Chart_min_js);
    INIT_RESOURCE("/js/Chart.HorizontalBar.js", js_Chart_HorizontalBar_js);
--- a/src/resources.h
+++ b/src/resources.h
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
--- a/src/resources/index.html
+++ b/src/resources/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html ng-app="laminar">
+<html>
 <head>
 <base href="/">
 <meta charset="utf-8">
@@ -8,14 +8,13 @@
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <link rel="apple-touch-icon-precomposed" href="/favicon-152.png">
 <title>Laminar</title>
- <script src="/js/angular.min.js"></script>
- <script src="/js/angular-route.min.js"></script>
- <script src="/js/angular-sanitize.min.js"></script>
- <script src="/js/ansi_up.js" type="text/javascript"></script>
+ <script src="/js/vue.min.js"></script>
+ <script src="/js/vue-router.min.js"></script>
+ <script src="/js/ansi_up.js"></script>
 <script src="/js/Chart.min.js"></script>
 <script src="/js/Chart.HorizontalBar.js"></script>
 <link href="/css/bootstrap.min.css" rel="stylesheet">
- <script src="/js/app.js"></script>
+ <script src="/js/app.js" defer></script>
 <style>
  body, html { height: 100%; }
  .navbar { margin-bottom: 0; }
@@ -36,42 +35,187 @@
   margin-top: 5px;
   margin-bottom: 0;
  }
-  .spin {
-	  -webkit-animation: rotation 2s infinite linear;
-  }
-  @-webkit-keyframes rotation {
-    from {-webkit-transform: rotate(0deg);}
-    to   {-webkit-transform: rotate(359deg);}
-  }
-  img.spin.small {
-	  width: 11px;
-	  height: 11px;
-  }
-  img.spin {
-    -webkit-animation:spin 4s linear infinite;
-    -moz-animation:spin 4s linear infinite;
-    animation:spin 4s linear infinite;
-}
-@-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } }
-@-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } }
-@keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } }
-
+  table#joblist tr:first-child td { border-top: 0; }
 </style>
 </head>
 <body>
- <nav class="navbar navbar-inverse">
-  <div class="container-fluid">
-   <div>
-    <a class="navbar-brand" href="/"><img src="/icon.png">{{title}}</a>
-    <a class="btn navbar-btn pull-right" href="/jobs">Jobs</a>
+ <template id="home"><div>
+  <ol class="breadcrumb"><li class="active">Home</li></ol>
+  <div class="container-fluid"><div class="row">
+   <div class="col-sm-5 col-md-4 col-lg-3 dash">
+    <table class="table table-bordered">
+     <tr v-for="job in jobsQueued">
+      <td><router-link :to="'/jobs/'+job.name">{{job.name}}</router-link> <i>queued</i></td>
+     </tr>
+     <tr v-for="job in jobsRunning">
+      <td><img class="spin small" src="/progress.gif"> <router-link :to="'/jobs/'+job.name">{{job.name}}</router-link> <router-link :to="'/jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link> <div class="progress">
+       <div class="progress-bar progress-bar-striped" :class="'progress-bar-'+(job.overtime?'warning':'info')" :class="job.etc?'':'active'" :style="'width:'+(!job.etc?'100':job.progress)+'%'"></div>
+       </div>
+      </td>
+     </tr>
+     <tr v-for="job in jobsRecent">
+      <td><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+job.name">{{job.name}}</router-link> <router-link :to="'/jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link><br><small>Took {{job.duration}}s at {{formatDate(job.started)}}</small></td>
+     </tr>
+    </table>
   </div>
+   <div class="col-sm-7 col-md-8 col-lg-9"><div class="row">
+    <div class="col-md-6">
+     <div class="panel panel-default">
+      <div class="panel-heading">Total builds per day this week</div>
+      <div class="panel-body">
+       <canvas id="chartBpd"></canvas>
+      </div>
+     </div>
+    </div>
+    <div class="col-md-6">
+     <div class="panel panel-default">
+      <div class="panel-heading">Builds per job in the last 24 hours</div>
+      <div class="panel-body" id="chartStatus">
+       <canvas id="chartBpj"></canvas>
+      </div>
+     </div>
+    </div>
+    <div class="col-md-6">
+     <div class="panel panel-default">
+      <div class="panel-heading">Average build time per job this week</div>
+      <div class="panel-body">
+       <canvas id="chartTpj"></canvas>
+      </div>
+     </div>
+    </div>
+    <div class="col-md-6">
+     <div class="panel panel-default">
+      <div class="panel-heading">Current executor utilization</div>
+      <div class="panel-body">
+       <canvas id="chartUtil"></canvas>
+      </div>
+     </div>
+    </div>
+   </div></div>
+  </div></div> 
+ </div></template>
+ 
+ <template id="jobs"><div>
+  <ol class="breadcrumb"><li><router-link to="/">Home</router-link></li><li class="active">Jobs</li></ol>
+  <div class="container-fluid"><div class="row">
+   <div class="col-xs-12">
+    <div class="pull-right">
+     <input class="form-control" id="jobFilter" v-model="search" placeholder="Filter...">
+    </div>
+    <ul class="nav nav-tabs">
+     <li :class="{'active':tag==null}"><a href v-on:click.prevent="tag = null">All Jobs</a></li>
+     <li v-for="t in tags" :class="{'active':t==tag}"><a href v-on:click.prevent="tag = t">{{t}}</a></li>
+    </ul>
+    <table class="table table-striped" id="joblist">
+     <tr   v-for="job in filteredJobs">
+      <td><router-link :to="'/jobs/'+job.name">{{job.name}}</router-link></td>
+      <td class="text-center"><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link></td>
+      <td class="text-center">{{formatDate(job.started)}}</td>
+     </tr>
+    </table>
+   </div>
+  </div></div>
+ </div></template>
+ 
+ <template id="job"><div>
+  <ol class="breadcrumb"><li><router-link to="/">Home</router-link></li><li><router-link to="/jobs">Jobs</router-link></li><li class="active">{{$route.params.name}}</li></ol></ol>
+  <div class="container-fluid">
+   <div class="row">
+    <div class="col-sm-5 col-md-6 col-lg-7">
+    <h3>{{$route.params.name}}</h3>
+    <dl class="dl-horizontal">
+     <dt>Last Successful Run</dt>
+     <dd><router-link v-if="lastSuccess" :to="'/jobs/'+$route.params.name+'/'+lastSuccess.number">#{{lastSuccess.number}}</router-link> {{lastSuccess?' - at '+formatDate(lastSuccess.started):'never'}}</dd>
+     <dt>Last Failed Run</dt>
+     <dd><router-link v-if="lastFailed" :to="'/jobs/'+$route.params.name+'/'+lastFailed.number">#{{lastFailed.number}}</router-link> {{lastFailed?' - at '+formatDate(lastFailed.started):'never'}}</dd>
+    </dl>
+    </div>
+    <div class="col-sm-7 col-md-6 col-lg-5">
+    <div class="panel panel-default">
+      <div class="panel-heading">Build time</div>
+      <div class="panel-body">
+      <canvas id="chartBt"></canvas>
+      </div>
+    </div>
+    </div>
+   </div>
+   <div class="row"><div class="col-xs-12">
+    <table class="table table-striped"><thead>
+     <tr><th>Run</th><th class="text-center">Started</th><th class="text-center">Duration</th><th class="text-center hidden-xs">Reason</th></tr></thead>
+     <tr v-show="nQueued">
+      <td colspan="4"><i>{{nQueued}} run(s) queued</i></td>
+     </tr>
+     <tr v-for="job in jobsRunning" track-by="$index">
+      <td><img class="spin small" src="/progress.gif"> <router-link :to="'/jobs/'+$route.params.name+'/'+job.number">#{{job.number}}</router-link></td>
+      <td class="text-center">{{formatDate(job.started)}}</td>
+      <td class="text-center">--</td>
+      <td class="text-center hidden-xs">{{job.reason}}</td>
+     </tr>
+     <tr v-for="job in jobsRecent" track-by="$index">
+      <td><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+$route.params.name+'/'+job.number">#{{job.number}}</router-link></td>
+      <td class="text-center">{{formatDate(job.started)}}</td>
+      <td class="text-center">{{job.duration + " seconds"}}</td>
+      <td class="text-center hidden-xs">{{job.reason}}</td>
+     </tr>
+    </table>
+   </div></div>
  </div>
- </nav>
- <ol class="breadcrumb">
-  <li ng-repeat="n in bc.nodes track by $index"><a href="{{n.href}}">{{n.label}}</a></li>
-  <li class="active">{{bc.current}}</li>
- </ol>
- <div ng-view></div>
+ </div></template>
+ 
+ <template id="run"><div>
+  <ol class="breadcrumb"><li><router-link to="/">Home</router-link></li><li><router-link to="/jobs">Jobs</router-link></li><li><router-link :to="'/jobs/'+$route.params.name">{{$route.params.name}}</router-link></li><li class="active">#{{$route.params.number}}</li></ol></ol>
+  <div class="container-fluid">
+   <div class="row">
+    <div class="col-sm-5 col-md-6 col-lg-7">
+     <h3 style="float:left"><img class="spin" src="/progress.gif" v-show="job.result === 'running'"><span v-html="runIcon(job.result)"></span> {{$route.params.name}} #{{$route.params.number}}</h3>
+     <nav class="pull-left">
+      <ul class="pagination" style="margin:15px 20px">
+       <li v-show="$route.params.number > 1"><router-link :to="'/jobs/'+$route.params.name+'/'+($route.params.number-1)">&laquo;</router-link></li>
+       <li v-show="latestNum > $route.params.number"><router-link :to="'/jobs/'+$route.params.name+'/'+(parseInt($route.params.number)+1)">&raquo;</router-link></li>
+      </ul>
+     </nav>
+     <div style="clear:both;"></div>
+     <dl class="dl-horizontal">
+      <dt>Reason</dt><dd>{{job.reason}}</dd>
+      <dt>Queued for</dt><dd>{{job.queued}}s</dd>
+      <dt>Started</dt><dd>{{formatDate(job.started)}}</dd>
+      <dt v-show="runComplete(job)">Completed</dt><dd v-show="job.completed">{{formatDate(job.completed)}}</dd>
+      <dt v-show="runComplete(job)">Duration</dt><dd v-show="runComplete(job)">{{job.duration}}s</dd>
+     </dl>
+    </div>
+    <div class="col-sm-7 col-md-6 col-lg-5">
+     <div class="progress" v-show="job.result == 'running'">
+      <div class="progress-bar  progress-bar-striped" :class="'progress-bar-'+(job.overtime?'warning':'info')" :class="job.etc?'':'active'" :style="{width:!job.etc?100:job.progress + '%'}"></div>
+     </div>
+     <div class="panel panel-default" v-show="job.artifacts.length">
+      <div class="panel-heading">Artifacts</div>
+      <div class="panel-body">
+       <ul class="list-unstyled" style="margin-bottom: 0">
+        <li v-for="art in job.artifacts"><router-link :to="art.url" target="_self">{{art.filename}}</router-link></li>
+       </ul>
+      </div>
+     </div>
+    </div>
+   </div>
+   <div class="row"><div class="col-xs-12">
+    <button type="button" class="btn btn-default btn-xs pull-right" :class="{'active':autoscroll}" v-on:click="autoscroll = !autoscroll" style="margin-top:10px">Autoscroll</button>
+    <h4>Console output</h4>
+    <pre v-html="log"></pre>
+   </div></div>
+  </div>
+ </div></template>
+
+ <div id="app">
+  <nav class="navbar navbar-inverse">
+   <div class="container-fluid">
+    <div>
+     <router-link to="/" class="navbar-brand"><img src="/icon.png">{{title}}</router-link>
+     <router-link to="/jobs" class="btn navbar-btn pull-right">Jobs</router-link>
+    </div>
+   </div>
+  </nav>
+  <router-view></router-view>
+ </div>
 </body>
 </html>

--- a/src/resources/js/app.js
+++ b/src/resources/js/app.js
@@ -1,340 +1,445 @@
-angular.module('laminar',['ngRoute','ngSanitize'])
-.config(function($routeProvider, $locationProvider, $sceProvider) {
-	$routeProvider
-	.when('/', {
-		templateUrl: 'tpl/home.html',
-		controller: 'mainController'
-	})
-	.when('/jobs', {
-		templateUrl: 'tpl/browse.html',
-		controller: 'BrowseController',
-	})
-	.when('/jobs/:name', {
-		templateUrl: 'tpl/job.html',
-		controller: 'JobController'
-	})
-	.when('/jobs/:name/:num', {
-		templateUrl: 'tpl/run.html',
-		controller: 'RunController'
-	})
-	$locationProvider.html5Mode(true);
-	$sceProvider.enabled(false);
-})
-.factory('$ws',function($q,$location){
-	return {
-		statusListener: function(callbacks) {
-			var ws = new WebSocket("ws://" + location.host + $location.path());
-			ws.onmessage = function(message) {
-				message = JSON.parse(message.data);
-				callbacks[message.type](message.data);
-			};
-		},
-		logListener: function(callback) {
-			var ws = new WebSocket("ws://" + location.host + $location.path() + '/log');
-			ws.onmessage = function(message) {
-				callback(message.data);
-			};
-		}
-	};
-})
-.controller('mainController', function($rootScope, $scope, $ws, $interval){
-	$rootScope.bc = {
-		nodes: [],
-		current: 'Home'
-	};
+/* laminar.js
+ * frontend application for Laminar Continuous Integration
+ * https://laminar.ohwg.net
+ */
+const WebsocketHandler = function() {
+  function setupWebsocket(path, next) {
+    var ws = new WebSocket("ws://" + window.location.host + path);
+    ws.onmessage = function(msg) {
+      msg = JSON.parse(msg.data);
+      // "status" is the first message the websocket always delivers.
+      // Use this to confirm the navigation. The component is not
+      // created until next() is called, so creating a reference
+      // for other message types must be deferred
+      if (msg.type === 'status') {
+        next(comp => {
+          // Set up bidirectional reference
+          // 1. needed to reference the component for other msg types
+          this.comp = comp;
+          // 2. needed to close the ws on navigation away
+          comp.ws = this;
+          // Update html and nav titles
+          document.title = comp.$root.title = msg.title;
+          // Component-specific callback handler
+          comp[msg.type](msg.data);
+        });
+      } else {
+        // at this point, the component must be defined
+        if (!this.comp)
+          return console.error("Page component was undefined");
+        else if (typeof this.comp[msg.type] === 'function')
+          this.comp[msg.type](msg.data);
+      }
+    };
+  };
+  return {
+    beforeRouteEnter(to, from, next) {
+      setupWebsocket(to.path, (fn) => { next(fn); });
+    },
+    beforeRouteUpdate(to, from, next) {
+      this.ws.close();
+      setupWebsocket(to.path, (fn) => { fn(this); next(); });
+    },
+    beforeRouteLeave(to, from, next) {
+      this.ws.close();
+      next();
+    },
+  };
+}();

-	$scope.jobsQueued = [];
-	$scope.jobsRunning = [];
-	$scope.jobsRecent = [];
-	var chtUtilization, chtBuildsPerDay, chtBuildsPerJob, chtTimePerJob;
-	
-	var updateUtilization = function(busy) {
-		chtUtilization.segments[0].value += busy ? 1 : -1;
-		chtUtilization.segments[1].value -= busy ? 1 : -1;
-		chtUtilization.update();
-	}
-			
-	$ws.statusListener({
-		status: function(data) {
-			$rootScope.title = data.title;
-			// populate jobs
-			$scope.jobsQueued = data.queued;
-			data.running.forEach($rootScope.updateProgress);
-			$scope.jobsRunning = data.running;
-			$scope.jobsRecent = data.recent;
-			$scope.$apply();
-			
-			// setup charts
-			chtUtilization = new Chart(document.getElementById("chartUtil").getContext("2d")).Pie(
-				[{value: data.executorsBusy, color:"tan", label: "Busy"},
-				 {value: data.executorsTotal, color: "darkseagreen", label: "Idle"}],
-				{animationEasing: 'easeInOutQuad'}
-			);
-			chtBuildsPerDay = new Chart(document.getElementById("chartBpd").getContext("2d")).Line({
-				labels: function(){
-					res = [];
-					var now = new Date();
-					for(var i = 6; i >= 0; --i) {
-						var then = new Date(now.getTime() - i*86400000);
-						res.push(["Sun","Mon","Tue","Wed","Thu","Fri","Sat"][then.getDay()]);
-					}
-					return res;
-				}(),
-				datasets: [{
-					label: "Successful Builds",
-					fillColor: "darkseagreen",
-					strokeColor: "forestgreen",
-					data: data.buildsPerDay.map(function(e){return e.success||0;})
-				},{
-					label: "Failed Bulids",
-					fillColor: "darksalmon",
-					strokeColor: "crimson",
-					data: data.buildsPerDay.map(function(e){return e.failed||0;})
-				}]},
-				{ showTooltips: false }
-			);
-			chtBuildsPerJob = new Chart(document.getElementById("chartBpj").getContext("2d")).HorizontalBar({
-				labels: Object.keys(data.buildsPerJob),
-				datasets: [{
-					fillColor: "lightsteelblue",
-					data: Object.keys(data.buildsPerJob).map(function(e){return data.buildsPerJob[e];})
-				}]
-			},{});
-			chtTimePerJob = new Chart(document.getElementById("chartTpj").getContext("2d")).HorizontalBar({
-				labels: Object.keys(data.timePerJob),
-				datasets: [{
-					fillColor: "lightsteelblue",
-					data: Object.keys(data.timePerJob).map(function(e){return data.timePerJob[e];})
-				}]
-			},{});
-		},
-		job_queued: function(data) {
-			$scope.jobsQueued.splice(0,0,data);
-			$scope.$apply();
-		},
-		job_started: function(data) {
-			$scope.jobsQueued.splice($scope.jobsQueued.length - data.queueIndex - 1,1);
-			$scope.jobsRunning.splice(0,0,data);
-			$scope.$apply();
-			updateUtilization(true);
-		},
-		job_completed: function(data) {
-			if(data.result === "success")
-				chtBuildsPerDay.datasets[0].points[6].value++;
-			else
-				chtBuildsPerDay.datasets[1].points[6].value++;
-			chtBuildsPerDay.update();
+const Utils = {
+  methods: {
+    runIcon(result) {
+      return result === "success" ? '<span style="color:forestgreen;font-family:\'Zapf Dingbats\';">✔</span>' : result === "failed" || result === "aborted" ? '<span style="color:crimson;">✘</span>' : '';
+    },
+    formatDate: function(unix) {
+      // TODO: reimplement when toLocaleDateString() accepts formatting options on most browsers
+      var d = new Date(1000 * unix);
+      var m = d.getMinutes();
+      if (m < 10) m = '0' + m;
+      return d.getHours() + ':' + m + ' on ' + ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'][d.getDay()] + ' ' +
+        d.getDate() + '. ' + ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+          'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
+        ][d.getMonth()] + ' ' +
+        d.getFullYear();
+    },
+  }
+};

-			for(var i = 0; i < $scope.jobsRunning.length; ++i) {
-				var job = $scope.jobsRunning[i];
-				if(job.name == data.name && job.number == data.number) {
-					$scope.jobsRunning.splice(i,1);
-					$scope.jobsRecent.splice(0,0,data);
-					$scope.$apply();
-					
-					break;
-				}
-			}
-			updateUtilization(false);
-			for(var j = 0; j < chtBuildsPerJob.datasets[0].bars.length; ++j) {
-				if(chtBuildsPerJob.datasets[0].bars[j].label == job.name) {
-					chtBuildsPerJob.datasets[0].bars[j].value++;
-					chtBuildsPerJob.update();
-					break;
-				}
-			}
-		}
-	});
-	var timeUpdater = $interval(function() {
-		$scope.jobsRunning.forEach($rootScope.updateProgress);
-	}, 1000);
-	$scope.$on('$destroy', function() {
-		$interval.cancel(timeUpdater);
-	});
-})
-.controller('BrowseController', function($rootScope, $scope, $ws, $interval){
-	$rootScope.bc = {
-		nodes: [{ href: '/', label: 'Home' }],
-		current: 'Jobs'
-	};
+const ProgressUpdater = {
+  data() { return { jobsRunning: [] }; },
+  methods: {
+    updateProgress(o) {
+      if (o.etc) {
+        var p = ((new Date()).getTime() / 1000 - o.started) / (o.etc - o.started);
+        if (p > 1.2) {
+          o.overtime = true;
+        } else if (p >= 1) {
+          o.progress = 99;
+        } else {
+          o.progress = 100 * p;
+        }
+      }
+    }
+  },
+  beforeDestroy() {
+    clearInterval(this.updateTimer);
+  },
+  watch: {
+    jobsRunning(val) {
+      // this function handles several cases:
+      // - the route has changed to a different run of the same job
+      // - the current job has ended
+      // - the current job has started (practically hard to reach)
+      clearInterval(this.updateTimer);
+      if (val.length) {
+        // TODO: first, a non-animated progress update
+        this.updateTimer = setInterval(() => {
+          this.jobsRunning.forEach(this.updateProgress);
+          this.$forceUpdate();
+        }, 1000);
+      }
+    }
+  }
+};

-	$scope.currentTag = null;
-	$scope.activeTag = function(t) {
-		return $scope.currentTag === t;
-	};
-	$scope.bytag = function(job) {
-		if($scope.currentTag === null) return true;
-		return job.tags.indexOf($scope.currentTag) >= 0;
-	};
+const Home = function() {
+  var state = {
+    jobsQueued: [],
+    jobsRecent: []
+  };

-	$scope.jobs = [];
-	$ws.statusListener({
-		status: function(data) {
-			$rootScope.title = data.title;
-			$scope.jobs = data.jobs;
-			var tags = {};
-			for(var i in data.jobs) {
-				for(var j in data.jobs[i].tags) {
-					tags[data.jobs[i].tags[j]] = true;
-				}
-			}
-			$scope.tags = Object.keys(tags);
-			$scope.$apply();
-		},
-		job_completed: function(data) {
-			for(var i in $scope.jobs) {
-				if($scope.jobs[i].name === data.name) {
-					$scope.jobs[i] = data;
-					$scope.$apply;
-					break;
-				}
-			}
-		}
-	});
-})
-.controller('JobController', function($rootScope, $scope, $routeParams, $ws) {
-	$rootScope.bc = {
-		nodes: [{ href: '/', label: 'Home' },{ href: '/jobs', label: 'Jobs' }],
-		current: $routeParams.name
-	};
-	
-	$scope.name = $routeParams.name;
-	$scope.jobsRunning = [];
-	$scope.jobsRecent = [];
+  var chtUtilization, chtBuildsPerDay, chtBuildsPerJob, chtTimePerJob;

-	$ws.statusListener({
-		status: function(data) {
-			$rootScope.title = data.title;
+  var updateUtilization = function(busy) {
+    chtUtilization.segments[0].value += busy ? 1 : -1;
+    chtUtilization.segments[1].value -= busy ? 1 : -1;
+    chtUtilization.update();
+  }

-			$scope.jobsRunning = data.running;
-			$scope.jobsRecent = data.recent;
-			$scope.lastSuccess = data.lastSuccess;
-			$scope.lastFailed = data.lastFailed;
-			$scope.$apply();
-			
-			var chtBt = new Chart(document.getElementById("chartBt").getContext("2d")).Bar({
-				labels: data.recent.map(function(e){return '#' + e.number;}).reverse(),
-				datasets: [{
-					fillColor: "darkseagreen",
-					strokeColor: "forestgreen",
-					data: data.recent.map(function(e){return e.duration;}).reverse()
-				}]
-			},
-			{barValueSpacing: 1,barStrokeWidth: 1,barDatasetSpacing:0}
-			);
+  return {
+    template: '#home',
+    mixins: [WebsocketHandler, Utils, ProgressUpdater],
+    data: function() {
+      return state;
+    },
+    methods: {
+      status: function(msg) {
+        state.jobsQueued = msg.queued;
+        state.jobsRunning = msg.running;
+        state.jobsRecent = msg.recent;
+        this.$forceUpdate();

-			for(var i = 0, n = data.recent.length; i < n; ++i) {
-				if(data.recent[i].result != "success") {
-					chtBt.datasets[0].bars[n-i-1].fillColor = "darksalmon";
-					chtBt.datasets[0].bars[n-i-1].strokeColor = "crimson";
-				}
-			}
-			chtBt.update();
-			
-		},
-		job_queued: function() {
-			$scope.nQueued++;
-		},
-		job_started: function(data) {
-			$scope.nQueued--;
-			$scope.jobsRunning.splice(0,0,data);
-			$scope.$apply();
-		},
-		job_completed: function(data) {
-			for(var i = 0; i < $scope.jobsRunning.length; ++i) {
-				var job = $scope.jobsRunning[i];
-				if(job.number === data.number) {
-					$scope.jobsRunning.splice(i,1);
-					$scope.jobsRecent.splice(0,0,data);
-					$scope.$apply();
-					break;
-				}
-			}
-		}
-	});
-})
-.controller('RunController', function($rootScope, $scope, $routeParams, $ws, $interval) {
-	$rootScope.bc = {
-		nodes: [{ href: '/', label: 'Home' },
-		{ href: '/jobs', label: 'Jobs' },
-		{ href: '/jobs/'+$routeParams.name, label: $routeParams.name }
-		],
-		current: '#' + $routeParams.num
-	};
+        // setup charts
+        chtUtilization = new Chart(document.getElementById("chartUtil").getContext("2d")).Pie(
+          [{
+              value: msg.executorsBusy,
+              color: "tan",
+              label: "Busy"
+            },
+            {
+              value: msg.executorsTotal,
+              color: "darkseagreen",
+              label: "Idle"
+            }
+          ], {
+            animationEasing: 'easeInOutQuad'
+          }
+        );
+        chtBuildsPerDay = new Chart(document.getElementById("chartBpd").getContext("2d")).Line({
+          labels: function() {
+            res = [];
+            var now = new Date();
+            for (var i = 6; i >= 0; --i) {
+              var then = new Date(now.getTime() - i * 86400000);
+              res.push(["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"][then.getDay()]);
+            }
+            return res;
+          }(),
+          datasets: [{
+            label: "Successful Builds",
+            fillColor: "darkseagreen",
+            strokeColor: "forestgreen",
+            data: msg.buildsPerDay.map(function(e) {
+              return e.success || 0;
+            })
+          }, {
+            label: "Failed Bulids",
+            fillColor: "darksalmon",
+            strokeColor: "crimson",
+            data: msg.buildsPerDay.map(function(e) {
+              return e.failed || 0;
+            })
+          }]
+        }, {
+          showTooltips: false
+        });
+        chtBuildsPerJob = new Chart(document.getElementById("chartBpj").getContext("2d")).HorizontalBar({
+          labels: Object.keys(msg.buildsPerJob),
+          datasets: [{
+            fillColor: "lightsteelblue",
+            data: Object.keys(msg.buildsPerJob).map(function(e) {
+              return msg.buildsPerJob[e];
+            })
+          }]
+        }, {});
+        chtTimePerJob = new Chart(document.getElementById("chartTpj").getContext("2d")).HorizontalBar({
+          labels: Object.keys(msg.timePerJob),
+          datasets: [{
+            fillColor: "lightsteelblue",
+            data: Object.keys(msg.timePerJob).map(function(e) {
+              return msg.timePerJob[e];
+            })
+          }]
+        }, {});

-	$scope.name = $routeParams.name;
-	$scope.num = parseInt($routeParams.num);

-	$ws.statusListener({
-		status: function(data) {
-			$rootScope.title = data.title;
-			$rootScope.updateProgress(data);
-			$scope.job = data;
-			$scope.latestNum = data.latestNum;
-			$scope.$apply();
-		},
-		job_started: function() {
-			$scope.latestNum++;
-			$scope.$apply();
-		},
-		job_completed: function(data) {
-			$scope.job = data;
-			$scope.$apply();
-		}
-	});
-	
-	$scope.log = ""
-	$scope.autoscroll = false;
-	var firstLog = false;
-	$ws.logListener(function(data) {
-		$scope.log += ansi_up.ansi_to_html(data.replace('<','&lt;').replace('>','&gt;'));
-		$scope.$apply();
-		if(!firstLog) {
-			firstLog = true;
-		} else if($scope.autoscroll) {
-			window.scrollTo(0, document.body.scrollHeight);
-		}
-	});
-	
-	var timeUpdater = $interval(function() {
-		$rootScope.updateProgress($scope.job);
-	}, 1000);
-	$scope.$on('$destroy', function() {
-		$interval.cancel(timeUpdater);
-	});
-})
-.run(function($rootScope) {
-	angular.extend($rootScope, {
-		runIcon: function(result) {
-			return result === "success" ? '<span style="color:forestgreen;font-family:\'Zapf Dingbats\';">✔</span>' : result === "failed" || result === "aborted" ? '<span style="color:crimson;">✘</span>' : '';
-		},
-		runComplete: function(run) {
-			return !!run && (run.result === 'aborted' || run.result === 'failed' || run.result === 'success');
-		},
-		formatDate: function(unix) {
-			// TODO reimplement when toLocaleDateString() accepts formatting
-			// options on most browsers
-			var d = new Date(1000 * unix);
-			var m = d.getMinutes();
-			if(m < 10) m = '0' + m;
-			return d.getHours() + ':' + m + ' on ' + 
-				['Sun','Mon','Tue','Wed','Thu','Fri','Sat'][d.getDay()] + ' '
-				+ d.getDate() + '. ' + ['Jan','Feb','Mar','Apr','May','Jun',
-				'Jul','Aug','Sep', 'Oct','Nov','Dec'][d.getMonth()] + ' '
-				+ d.getFullYear();
-		},
-		updateProgress: function(o){
-			if(o.etc) {
-				var d = new Date();
-				var p = (d.getTime()/1000 - o.started) / (o.etc - o.started);
-				if(p > 1.2) {
-					o.overtime = true;
-				} else if(p >= 1) {
-					o.progress = 99;
-				} else {
-					o.progress = 100 * p;
-				}
-			}
-		}
-	});
+      },
+      job_queued: function(data) {
+        state.jobsQueued.splice(0, 0, data);
+        this.$forceUpdate();
+      },
+      job_started: function(data) {
+        state.jobsQueued.splice(state.jobsQueued.length - data.queueIndex - 1, 1);
+        state.jobsRunning.splice(0, 0, data);
+        this.$forceUpdate();
+        updateUtilization(true);
+      },
+      job_completed: function(data) {
+        if (data.result === "success")
+          chtBuildsPerDay.datasets[0].points[6].value++;
+        else
+          chtBuildsPerDay.datasets[1].points[6].value++;
+        chtBuildsPerDay.update();
+
+        for (var i = 0; i < state.jobsRunning.length; ++i) {
+          var job = state.jobsRunning[i];
+          if (job.name == data.name && job.number == data.number) {
+            state.jobsRunning.splice(i, 1);
+            state.jobsRecent.splice(0, 0, data);
+            this.$forceUpdate();
+            break;
+          }
+        }
+        updateUtilization(false);
+        for (var j = 0; j < chtBuildsPerJob.datasets[0].bars.length; ++j) {
+          if (chtBuildsPerJob.datasets[0].bars[j].label == job.name) {
+            chtBuildsPerJob.datasets[0].bars[j].value++;
+            chtBuildsPerJob.update();
+            break;
+          }
+        }
+      }
+    }
+  };
+}();
+
+const Jobs = function() {
+  var state = {
+    jobs: [],
+    search: '',
+    tags: [],
+    tag: null
+  };
+  return {
+    template: '#jobs',
+    mixins: [WebsocketHandler, Utils],
+    data: function() { return state; },
+    computed: {
+      filteredJobs() {
+        var ret = this.jobs;
+        var tag = this.tag;
+        if (tag) {
+          ret = ret.filter(function(job) {
+            return job.tags.indexOf(tag) >= 0;
+          });
+        }
+        var search = this.search;
+        if (search) {
+          ret = ret.filter(function(job) {
+            return job.name.indexOf(search) > -1;
+          });
+        }
+        return ret;
+      }
+    },
+    methods: {
+      status: function(msg) {
+        state.jobs = msg.jobs;
+        var tags = {};
+        for (var i in state.jobs) {
+          for (var j in state.jobs[i].tags) {
+            tags[state.jobs[i].tags[j]] = true;
+          }
+        }
+        state.tags = Object.keys(tags);
+      },
+      job_completed: function(data) {
+        for (var i in state.jobs) {
+          if (state.jobs[i].name === data.name) {
+            state.jobs[i] = data;
+            this.$forceUpdate();
+            break;
+          }
+        }
+      }
+    }
+  };
+}();
+
+var Job = function() {
+  var state = {
+    jobsRunning: [],
+    jobsRecent: [],
+    lastSuccess: null,
+    lastFailed: null,
+    nQueued: 0,
+  };
+  return Vue.extend({
+    template: '#job',
+    mixins: [WebsocketHandler, Utils],
+    data: function() {
+      return state;
+    },
+    methods: {
+      status: function(msg) {
+        state.jobsRunning = msg.running;
+        state.jobsRecent = msg.recent;
+        state.lastSuccess = msg.lastSuccess;
+        state.lastFailed = msg.lastFailed;
+
+        var chtBt = new Chart(document.getElementById("chartBt").getContext("2d")).Bar({
+          labels: msg.recent.map(function(e) {
+            return '#' + e.number;
+          }).reverse(),
+          datasets: [{
+            fillColor: "darkseagreen",
+            strokeColor: "forestgreen",
+            data: msg.recent.map(function(e) {
+              return e.duration;
+            }).reverse()
+          }]
+        }, {
+          barValueSpacing: 1,
+          barStrokeWidth: 1,
+          barDatasetSpacing: 0
+        });
+
+        for (var i = 0, n = msg.recent.length; i < n; ++i) {
+          if (msg.recent[i].result != "success") {
+            chtBt.datasets[0].bars[n - i - 1].fillColor = "darksalmon";
+            chtBt.datasets[0].bars[n - i - 1].strokeColor = "crimson";
+          }
+        }
+        chtBt.update();
+
+      },
+      job_queued: function() {
+        state.nQueued++;
+      },
+      job_started: function(data) {
+        state.nQueued--;
+        state.jobsRunning.splice(0, 0, data);
+        this.$forceUpdate();
+      },
+      job_completed: function(data) {
+        for (var i = 0; i < state.jobsRunning.length; ++i) {
+          var job = state.jobsRunning[i];
+          if (job.number === data.number) {
+            state.jobsRunning.splice(i, 1);
+            state.jobsRecent.splice(0, 0, data);
+            this.$forceUpdate();
+            // TODO: update the chart
+            break;
+          }
+        }
+      }
+    }
+  });
+}();
+
+const Run = function() {
+  var state = {
+    job: { artifacts: [] },
+    latestNum: null,
+    log: '',
+    autoscroll: false
+  };
+  var firstLog = false;
+  var logHandler = function(vm, d) {
+    state.log += d;
+    vm.$forceUpdate();
+    if (!firstLog) {
+      firstLog = true;
+    } else if (state.autoscroll) {
+      window.scrollTo(0, document.body.scrollHeight);
+    }
+  };
+
+  return {
+    template: '#run',
+    mixins: [WebsocketHandler, Utils, ProgressUpdater],
+    data: function() {
+      return state;
+    },
+    methods: {
+      status: function(data) {
+        state.jobsRunning = [];
+        state.log = '';
+        state.job = data;
+        state.latestNum = data.latestNum;
+        if (!!state.job.etc)
+          state.jobsRunning = [data];
+      },
+      job_started: function(data) {
+        state.latestNum++;
+        this.$forceUpdate();
+      },
+      job_completed: function(data) {
+        state.job = data;
+        state.jobsRunning = [];
+        this.$forceUpdate();
+      },
+      runComplete: function(run) {
+        return !!run && (run.result === 'aborted' || run.result === 'failed' || run.result === 'success');
+      },
+    },
+    beforeRouteEnter(to, from, next) {
+      next(vm => {
+        vm.logws = new WebSocket("ws://" + location.host + to.path + '/log');
+        vm.logws.onmessage = function(msg) {
+          logHandler(vm, msg.data);
+        }
+      });
+    },
+    beforeRouteUpdate(to, from, next) {
+      var vm = this;
+      vm.logws.close();
+      vm.logws = new WebSocket("ws://" + location.host + to.path + '/log');
+      vm.logws.onmessage = function(msg) {
+        logHandler(vm, msg.data);
+      }
+      next();
+    },
+    beforeRouteLeave(to, from, next) {
+      this.logws.close();
+      next();
+    }
+  };
+}();
+
+new Vue({
+  el: '#app',
+  data: {
+    title: '' // populated by status ws message
+  },
+  router: new VueRouter({
+    mode: 'history',
+    routes: [
+      { path: '/',                   component: Home },
+      { path: '/jobs',               component: Jobs },
+      { path: '/jobs/:name',         component: Job },
+      { path: '/jobs/:name/:number', component: Run }
+    ],
+  }),
 });
--- a/src/resources/progress.gif
+++ b/src/resources/progress.gif
--- a/src/resources/tpl/browse.html
+++ b/src/resources/tpl/browse.html
@@ -1,21 +0,0 @@
-<div class="container-fluid">
-<div class="row">
-<div class="col-xs-12">
- <div class="pull-right">
-  <input class="form-control" id="jobFilter" ng-model="search.name" placeholder="Filter...">
- </div>
- <ul class="nav nav-tabs">
-  <li ng-class="{active:activeTag(null)}"><a href ng-click="currentTag = null">All Jobs</a></li>
-  <li ng-repeat="tag in tags" ng-class="{active:activeTag(tag)}"><a href ng-click="$parent.currentTag = tag">{{tag}}</a></li>
- </ul>
- <style>table#joblist tr:first-child td { border-top: 0; }</style>
- <table class="table table-striped" id="joblist">
-  <tr class="animate-repeat" ng-repeat="job in jobs | filter:bytag | filter:search">
-   <td><a href="jobs/{{job.name}}">{{job.name}}</a></td>
-   <td class="text-center"><span ng-bind-html="runIcon(job.result)"></span> <a href="jobs/{{job.name}}/{{job.number}}">#{{job.number}}</a></td>
-   <td class="text-center">{{formatDate(job.started)}}</a></td>
-  </tr>
- </table>
-</div>
-</div>
-</div>
--- a/src/resources/tpl/home.html
+++ b/src/resources/tpl/home.html
@@ -1,58 +0,0 @@
-<div class="container-fluid">
-<div class="row">
-<div class="col-sm-5 col-md-4 col-lg-3 dash">
- <table class="table table-bordered">
-  <tr class="animate-repeat" ng-repeat="job in jobsQueued track by $index">
-   <td><a href="jobs/{{job.name}}">{{job.name}}</a> <i>queued</i></td>
-  </tr>
-  <tr class="animate-repeat" ng-repeat="job in jobsRunning track by $index">
-   <td><img class="spin small" src="/progress.png"> <a href="jobs/{{job.name}}">{{job.name}}</a> <a href="jobs/{{job.name}}/{{job.number}}">#{{job.number}}</a> <div class="progress">
-    <div class="progress-bar progress-bar-{{job.overtime?'warning':'info'}} progress-bar-striped {{job.etc?'':'active'}}" style="width:{{!job.etc?'100':job.progress}}%"></div>
-    </div>
-   </td>
-  </tr>
-  <tr class="animate-repeat" ng-repeat="job in jobsRecent track by $index">
-   <td><span ng-bind-html="runIcon(job.result)"></span> <a href="jobs/{{job.name}}">{{job.name}}</a> <a href="jobs/{{job.name}}/{{job.number}}">#{{job.number}}</a><br><small>Took {{job.duration}}s at {{formatDate(job.started)}}</small></td>
-  </tr>
- </table>
-</div>
-<div class="col-sm-7 col-md-8 col-lg-9">
-<div class="row">
-<div class="col-md-6">
- <div class="panel panel-default">
-  <div class="panel-heading">Total builds per day this week</div>
-  <div class="panel-body">
-   <canvas id="chartBpd"></canvas>
-  </div>
- </div>
-</div>
-<div class="col-md-6">
- <div class="panel panel-default">
-  <div class="panel-heading">Builds per job in the last 24 hours</div>
-  <div class="panel-body" id="chartStatus">
-   <canvas id="chartBpj"></canvas>
-  </div>
- </div>
-</div>
-<div class="col-md-6">
- <div class="panel panel-default">
-  <div class="panel-heading">Average build time per job this week</div>
-  <div class="panel-body">
-   <canvas id="chartTpj"></canvas>
-  </div>
-
- </div>
-</div>
-<div class="col-md-6">
- <div class="panel panel-default">
-  <div class="panel-heading">Current executor utilization</div>
-  <div class="panel-body">
-   <canvas id="chartUtil"></canvas>
-  </div>
- </div>
-</div>
-</div>
-</div>
-</div>
-</div>
-
--- a/src/resources/tpl/job.html
+++ b/src/resources/tpl/job.html
@@ -1,51 +0,0 @@
-<div class="container-fluid">
-<div class="row">
-	
- <div class="col-sm-5 col-md-6 col-lg-7">
-  <h3>{{name}}</h3>
-  <dl class="dl-horizontal">
-   <dt>Last Successful Run</dt><dd>
-	   <a ng-show="lastSuccess" href="jobs/{{name}}/{{lastSuccess.number}}">#{{lastSuccess.number}}</a>   
-	   {{lastSuccess?" - at "+formatDate(lastSuccess.started):"never"}}</dd>
-     <dt>Last Failed Run</dt><dd>
-	   <a ng-show="lastFailed" href="jobs/{{name}}/{{lastFailed.number}}">#{{lastFailed.number}}</a>   
-	   {{lastFailed?" - at "+formatDate(lastFailed.started):"never"}}</dd>
-  </dl>
-
- </div>
- <div class="col-sm-7 col-md-6 col-lg-5">
-  <div class="panel panel-default">
-   <div class="panel-heading">Build time</div>
-   <div class="panel-body">
-    <canvas id="chartBt"></canvas>
-   </div>
-  </div>
- </div>
- 
-</div>
-<div class="row">
-
- <div class="col-xs-12">
-  <table class="table table-striped"><thead>
-   <tr><th>Run</th><th class="text-center">Started</th><th class="text-center">Duration</th><th class="text-center hidden-xs">Reason</th></tr></thead>
-   <tr ng-show="nQueued">
-    <td colspan="4"><i>{{nQueued}} run(s) queued</i></td>
-   </tr>
-   <tr class="animate-repeat" ng-repeat="job in jobsRunning track by $index">
-    <td><img class="spin small" src="/progress.png"> <a href="jobs/{{name}}/{{job.number}}">#{{job.number}}</a></td>
-    <td class="text-center">{{formatDate(job.started)}}</td>
-    <td class="text-center">--</td>
-    <td class="text-center hidden-xs">{{job.reason}}</td>
-   </tr>
-   <tr class="animate-repeat" ng-repeat="job in jobsRecent track by $index">
-    <td><span ng-bind-html="runIcon(job.result)"></span> <a href="jobs/{{name}}/{{job.number}}">#{{job.number}}</a></td>
-    <td class="text-center">{{formatDate(job.started)}}</td>
-    <td class="text-center">{{job.duration + " seconds"}}</td>
-    <td class="text-center hidden-xs">{{job.reason}}</td>
-   </tr>
-  </table>
- </div>
- 
-</div>
-</div>
-
--- a/src/resources/tpl/run.html
+++ b/src/resources/tpl/run.html
@@ -1,43 +0,0 @@
-<div class="container-fluid">
-<div class="row">
-<div class="col-sm-5 col-md-6 col-lg-7">
- <h3 style="float:left"><img class="spin" src="/progress.png" ng-show="job.result === 'running'"><span ng-bind-html="runIcon(job.result)"></span> {{name}} #{{num}}</h3>
- <nav class="pull-left">
-  <ul class="pagination" style="margin:15px 20px">
-   <li ng-show="num > 1"><a href="jobs/{{name}}/{{num-1}}">&laquo;</a></li>
-   <li ng-show="latestNum > num"><a ng-href="jobs/{{name}}/{{num+1}}">&raquo;</a></li>
-  </ul>
- </nav>
- <div style="clear:both;"></div>
- <dl class="dl-horizontal">
-  <dt>Reason</dt><dd>{{job.reason}}</dd>
-  <dt>Queued for</dt><dd>{{job.queued}}s</dd>
-  <dt>Started</dt><dd>{{formatDate(job.started)}}</dd>
-  <dt ng-show="runComplete(job)">Completed</dt><dd ng-show="runComplete(job)">{{formatDate(job.completed)}}</dd>
-  <dt ng-show="runComplete(job)">Duration</dt><dd ng-show="runComplete(job)">{{job.duration}}s</dd>
- </dl>
-</div>
-<div class="col-sm-7 col-md-6 col-lg-5">
- <div class="progress" ng-show="job.result == 'running'">
-  <div class="progress-bar progress-bar-{{job.overtime?'warning':'info'}} progress-bar-striped {{job.etc?'':'active'}}" style="width:{{!job.etc?'100':job.progress}}%;"></div>
- </div>
- <div class="panel panel-default" ng-show="job.artifacts.length">
-  <div class="panel-heading">Artifacts</div>
-  <div class="panel-body">
-   <ul class="list-unstyled" style="margin-bottom: 0">
-	<li ng-repeat="art in job.artifacts">
-	 <a href="{{art.url}}" target="_self">{{art.filename}}</a>
-	</li>
-   </ul>
-  </div>
- </div>
-</div>
-</div>
-<div class="row">
-<div class="col-xs-12">
- <button type="button" class="btn btn-default btn-xs pull-right" ng-class="{active:autoscroll}" ng-click="autoscroll = !autoscroll" style="margin-top:10px">Autoscroll</button>
- <h4>Console output</h4>
- <pre ng-bind-html="log"></pre>
-</div>
-</div>
-</div>
--- a/src/run.cpp
+++ b/src/run.cpp
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -23,6 +23,7 @@

 #include <iostream>
 #include <unistd.h>
+#include <signal.h>

 #include <boost/filesystem.hpp>
 namespace fs = boost::filesystem;
@@ -58,7 +59,7 @@ std::string Run::reason() const {
 }

 bool Run::step() {
-    if(!currentScript.empty() && procStatus != 0)
+    if(!currentScript.path.empty() && procStatus != 0)
        result = RunState::FAILED;

    if(scripts.size()) {
@@ -68,7 +69,13 @@ bool Run::step() {
        int pfd[2];
        pipe(pfd);
        pid_t pid = fork();
-        if(pid == 0) {
+        if(pid == 0) { // child
+            // reset signal mask (SIGCHLD blocked in Laminar::start)
+            sigset_t mask;
+            sigemptyset(&mask);
+            sigaddset(&mask, SIGCHLD);
+            sigprocmask(SIG_UNBLOCK, &mask, NULL);
+
            close(pfd[0]);
            dup2(pfd[1], 1);
            dup2(pfd[1], 2);
@@ -80,35 +87,38 @@ bool Run::step() {
                PATH.append(p);
            }

-            chdir(wd.c_str());
+            chdir(currentScript.cwd.c_str());

+            // conf file env vars
            for(std::string file : env) {
                StringMap vars = parseConfFile(file.c_str());
                for(auto& it : vars) {
                    setenv(it.first.c_str(), it.second.c_str(), true);
                }
            }
-
-            setenv("PATH", PATH.c_str(), true);
-            setenv("lBuildNum", buildNum.c_str(), true);
-            setenv("lJobName", name.c_str(), true);
-            if(!node->name.empty())
-                setenv("lNode", node->name.c_str(), true);
-            setenv("lResult", to_string(result).c_str(), true);
-            setenv("lLastResult", to_string(lastResult).c_str(), true);
-            setenv("lWorkspace", (fs::path(laminarHome)/"run"/name/"workspace").string().c_str(), true);
-            setenv("lArchive", (fs::path(laminarHome)/"archive"/name/buildNum.c_str()).string().c_str(), true);
+            // parameterized vars
            for(auto& pair : params) {
                setenv(pair.first.c_str(), pair.second.c_str(), false);
            }
-            fprintf(stderr, "[laminar] Executing %s\n", currentScript.c_str());
-            execl(currentScript.c_str(), currentScript.c_str(), NULL);
+
+            setenv("PATH", PATH.c_str(), true);
+            setenv("RUN", buildNum.c_str(), true);
+            setenv("JOB", name.c_str(), true);
+            if(!node->name.empty())
+                setenv("NODE", node->name.c_str(), true);
+            setenv("RESULT", to_string(result).c_str(), true);
+            setenv("LAST_RESULT", to_string(lastResult).c_str(), true);
+            setenv("WORKSPACE", (fs::path(laminarHome)/"run"/name/"workspace").string().c_str(), true);
+            setenv("ARCHIVE", (fs::path(laminarHome)/"archive"/name/buildNum.c_str()).string().c_str(), true);
+
+            fprintf(stderr, "[laminar] Executing %s\n", currentScript.path.c_str());
+            execl(currentScript.path.c_str(), currentScript.path.c_str(), NULL);
            // cannot use LLOG because stdout/stderr are captured
-            fprintf(stderr, "[laminar] Failed to execute %s\n", currentScript.c_str());
+            fprintf(stderr, "[laminar] Failed to execute %s\n", currentScript.path.c_str());
            _exit(1);
        }

-        LLOG(INFO, "Forked", currentScript, pid);
+        LLOG(INFO, "Forked", currentScript.path, currentScript.cwd, pid);
        close(pfd[1]);
        fd = pfd[0];
        this->pid = pid;
@@ -118,8 +128,8 @@ bool Run::step() {
        return true;
    }
 }
-void Run::addScript(std::string script) {
-    scripts.push(script);
+void Run::addScript(std::string scriptPath, std::string scriptWorkingDir) {
+    scripts.push({scriptPath, scriptWorkingDir});
 }
 void Run::addEnv(std::string path) {
    env.push_back(path);
--- a/src/run.h
+++ b/src/run.h
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -57,7 +57,10 @@ public:
    void complete();

    // adds a script to the queue of scripts to be executed by this run
-    void addScript(std::string script);
+    void addScript(std::string scriptPath, std::string scriptWorkingDir);
+
+    // adds a script to the queue using the runDir as the scripts CWD
+    void addScript(std::string script) { addScript(script, runDir); }

    // adds an environment file that will be sourced before this run
    void addEnv(std::string path);
@@ -74,7 +77,7 @@ public:
    RunState lastResult;
    std::string laminarHome;
    std::string name;
-    std::string wd;
+    std::string runDir;
    std::string parentName;
    int parentBuild = 0;
    std::string reasonMsg;
@@ -88,8 +91,14 @@ public:
    time_t queuedAt;
    time_t startedAt;
 private:
-    std::queue<std::string> scripts;
-    std::string currentScript;
+
+    struct Script {
+        std::string path;
+        std::string cwd;
+    };
+
+    std::queue<Script> scripts;
+    Script currentScript;
    std::list<std::string> env;
 };

--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -33,6 +33,10 @@

 #include <sys/eventfd.h>

+// Size of buffer used to read from file descriptors. Should be
+// a multiple of sizeof(struct signalfd_siginfo) == 128
+#define PROC_IO_BUFSIZE 4096
+
 // Configuration struct for the websocketpp template library.
 struct wsconfig : public websocketpp::config::core {
 //    static const websocketpp::log::level elog_level =
@@ -70,12 +74,17 @@ LaminarCi::JobResult fromRunState(RunState state) {
 // This is the implementation of the Laminar Cap'n Proto RPC interface.
 // As such, it implements the pure virtual interface generated from
 // laminar.capnp with calls to the LaminarInterface
-class RpcImpl : public LaminarCi::Server {
+class RpcImpl : public LaminarCi::Server, public LaminarWaiter {
 public:
    RpcImpl(LaminarInterface& l) :
        LaminarCi::Server(),
        laminar(l)
    {
+        laminar.registerWaiter(this);
+    }
+
+    ~RpcImpl() {
+        laminar.deregisterWaiter(this);
    }

    // Start a job, without waiting for it to finish
@@ -102,8 +111,9 @@ public:
            params[p.getName().cStr()] = p.getValue().cStr();
        }
        std::shared_ptr<Run> run = laminar.queueJob(jobName, params);
-        if(run.get()) {
-            return laminar.waitForRun(run.get()).then([context](RunState state) mutable {
+        if(const Run* r = run.get()) {
+            runWaiters[r].emplace_back(kj::newPromiseAndFulfiller<RunState>());
+            return runWaiters[r].back().promise.then([context](RunState state) mutable {
                context.getResults().setResult(fromRunState(state));
            });
        } else {
@@ -112,19 +122,6 @@ public:
        }
    }

-    // Wait for an already-running job to complete, returning the result
-    kj::Promise<void> pend(PendContext context) override {
-        std::string jobName = context.getParams().getJobName();
-        int buildNum = context.getParams().getBuildNum();
-        LLOG(INFO, "RPC pend", jobName, buildNum);
-
-        kj::Promise<RunState> promise = laminar.waitForRun(jobName, buildNum);
-
-        return promise.then([context](RunState state) mutable {
-            context.getResults().setResult(fromRunState(state));
-        });
-    }
-
    // Set a parameter on a running build
    kj::Promise<void> set(SetContext context) override {
        std::string jobName = context.getParams().getJobName();
@@ -139,9 +136,43 @@ public:
        return kj::READY_NOW;
    }

+    // Take a named lock
+    kj::Promise<void> lock(LockContext context) override {
+        std::string lockName = context.getParams().getLockName();
+        LLOG(INFO, "RPC lock", lockName);
+        auto& lockList = locks[lockName];
+        lockList.emplace_back(kj::newPromiseAndFulfiller<void>());
+        if(lockList.size() == 1)
+            lockList.front().fulfiller->fulfill();
+        return std::move(lockList.back().promise);
+    }
+
+    // Release a named lock
+    kj::Promise<void> release(ReleaseContext context) override {
+        std::string lockName = context.getParams().getLockName();
+        LLOG(INFO, "RPC release", lockName);
+        auto& lockList = locks[lockName];
+        if(lockList.size() == 0) {
+            LLOG(INFO, "Attempt to release unheld lock", lockName);
+            return kj::READY_NOW;
+        }
+        lockList.erase(lockList.begin());
+        if(lockList.size() > 0)
+            lockList.front().fulfiller->fulfill();
+        return kj::READY_NOW;
+    }
+private:
+    // Implements LaminarWaiter::complete
+    void complete(const Run* r) override {
+        for(kj::PromiseFulfillerPair<RunState>& w : runWaiters[r])
+            w.fulfiller->fulfill(RunState(r->result));
+        runWaiters.erase(r);
+    }
 private:
    LaminarInterface& laminar;
    kj::LowLevelAsyncIoProvider* asyncio;
+    std::unordered_map<std::string, std::list<kj::PromiseFulfillerPair<void>>> locks;
+    std::unordered_map<const Run*, std::list<kj::PromiseFulfillerPair<RunState>>> runWaiters;
 };


@@ -349,13 +380,17 @@ Server::Server(LaminarInterface& li, kj::StringPtr rpcBindAddress,
    tasks(*this)
 {
    // RPC task
-    tasks.add(ioContext.provider->getNetwork().parseAddress(rpcBindAddress, 0)
+    if(rpcBindAddress.startsWith("unix:"))
+        unlink(rpcBindAddress.slice(strlen("unix:")).cStr());
+    tasks.add(ioContext.provider->getNetwork().parseAddress(rpcBindAddress)
              .then([this](kj::Own<kj::NetworkAddress>&& addr) {
        acceptRpcClient(addr->listen());
    }));

    // HTTP task
-    tasks.add(ioContext.provider->getNetwork().parseAddress(httpBindAddress, 0)
+    if(httpBindAddress.startsWith("unix:"))
+        unlink(httpBindAddress.slice(strlen("unix:")).cStr());
+    tasks.add(ioContext.provider->getNetwork().parseAddress(httpBindAddress)
              .then([this](kj::Own<kj::NetworkAddress>&& addr) {
        acceptHttpClient(addr->listen());
    }));
@@ -371,22 +406,22 @@ void Server::start() {
    // this eventfd is just to allow us to quit the server at some point
    // in the future by adding this event to the async loop. I couldn't see
    // a simpler way...
-    efd = eventfd(0,0);
+    efd_quit = eventfd(0,0);
    kj::Promise<void> quit = kj::evalLater([this](){
        static uint64_t _;
-        auto wakeEvent = ioContext.lowLevelProvider->wrapInputFd(efd);
+        auto wakeEvent = ioContext.lowLevelProvider->wrapInputFd(efd_quit);
        return wakeEvent->read(&_, sizeof(uint64_t)).attach(std::move(wakeEvent));
    });
    quit.wait(ioContext.waitScope);
 }

 void Server::stop() {
-    eventfd_write(efd, 1);
+    eventfd_write(efd_quit, 1);
 }

-void Server::addProcess(int fd, std::function<void(char*,size_t)> readCb, std::function<void()> cb) {
-    auto event = this->ioContext.lowLevelProvider->wrapInputFd(fd);
-    tasks.add(handleProcessOutput(event,readCb).attach(std::move(event)).then(std::move(cb)));
+void Server::addDescriptor(int fd, std::function<void(char*,size_t)> cb) {
+    auto event = this->ioContext.lowLevelProvider->wrapInputFd(fd, kj::LowLevelAsyncIoProvider::TAKE_OWNERSHIP);
+    tasks.add(handleFdRead(event, cb).attach(std::move(event)));
 }

 void Server::acceptHttpClient(kj::Own<kj::ConnectionReceiver>&& listener) {
@@ -416,14 +451,15 @@ void Server::acceptRpcClient(kj::Own<kj::ConnectionReceiver>&& listener) {
    );
 }

-// handles stdout/stderr from a child process by sending it to the provided
-// callback function
-kj::Promise<void> Server::handleProcessOutput(kj::AsyncInputStream* stream, std::function<void(char*,size_t)> readCb) {
-    static char* buffer = new char[131072];
-    return stream->tryRead(buffer, 1, sizeof(buffer)).then([this,stream,readCb](size_t sz) {
-        readCb(buffer, sz);
+// returns a promise which will read a chunk of data from the file descriptor
+// wrapped by stream and invoke the provided callback with the read data.
+// Repeats until ::read returns <= 0
+kj::Promise<void> Server::handleFdRead(kj::AsyncInputStream* stream, std::function<void(char*,size_t)> cb) {
+    static char* buffer = new char[PROC_IO_BUFSIZE];
+    return stream->tryRead(buffer, 1, PROC_IO_BUFSIZE).then([this,stream,cb](size_t sz) {
        if(sz > 0) {
-            return handleProcessOutput(stream, readCb);
+            cb(buffer, sz);
+            return handleFdRead(stream, cb);
        }
        return kj::Promise<void>(kj::READY_NOW);
    });
--- a/src/server.h
+++ b/src/server.h
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -26,8 +26,8 @@

 struct LaminarInterface;

-// This class abstracts the HTTP/Websockets and Cap'n Proto RPC interfaces.
-// It also manages the program's asynchronous event loop
+// This class abstracts the HTTP/Websockets and Cap'n Proto RPC interfaces
+// and manages the program's asynchronous event loop
 class Server final : public kj::TaskSet::ErrorHandler {
 public:
    // Initializes the server with a LaminarInterface to handle requests from
@@ -38,22 +38,26 @@ public:
    ~Server();
    void start();
    void stop();
-    void addProcess(int fd, std::function<void(char*,size_t)> readCb, std::function<void()> cb);
+
+    // add a file descriptor to be monitored for output. The callback will be
+    // invoked with the read data
+    void addDescriptor(int fd, std::function<void(char*,size_t)> cb);

 private:
    void acceptHttpClient(kj::Own<kj::ConnectionReceiver>&& listener);
    void acceptRpcClient(kj::Own<kj::ConnectionReceiver>&& listener);
-    kj::Promise<void> handleProcessOutput(kj::AsyncInputStream* stream, std::function<void(char*,size_t)> readCb);
+    kj::Promise<void> handleFdRead(kj::AsyncInputStream* stream, std::function<void(char*,size_t)> cb);

    void taskFailed(kj::Exception&& exception) override {
        kj::throwFatalException(kj::mv(exception));
    }

 private:
-    int efd;
-    capnp::Capability::Client rpcInterface;
    struct WebsocketConnection;
    struct HttpImpl;
+
+    int efd_quit;
+    capnp::Capability::Client rpcInterface;
    HttpImpl* httpInterface;
    kj::AsyncIoContext ioContext;
    kj::TaskSet tasks;
Author	SHA1	Message	Date
Oliver Giles	c40b872f85	new README-based documentation	2017-08-20 07:43:44 +03:00
Oliver Giles	3f32e9cb37	use git describe instead of hard-coded version number in build scripts	2017-08-19 10:47:27 +03:00
Oliver Giles	97bb43ae4f	use latest capnp in docker build scripts until 6.2 is released, using the at least this hash allows the use of 'unix-abstract:' addresses	2017-08-19 10:43:01 +03:00
Oliver Giles	91baf358da	plain run vars override vars from parameterized triggers	2017-08-16 09:09:01 +03:00
Oliver Giles	636dfb8651	use shorter build vars in traditional style	2017-08-16 09:08:57 +03:00
Oliver Giles	2dac3e324b	add explanation of LAMINAR_BIND_* to laminar.conf	2017-08-16 08:20:20 +03:00
Oliver Giles	0b9fb54b02	laminarc: read LAMINAR_BIND_RPC	2017-08-15 08:41:53 +03:00
Oliver Giles	b7644494fc	unlink unix sockets before binding	2017-08-15 08:33:15 +03:00
Oliver Giles	713462f37f	update progress bar when navigating between Runs When navigating between Run pages, the jobsRunning array used by the ProgressUpdater was cleared after the status message had inserted the new Run instead of before	2017-08-15 08:33:15 +03:00
Oliver Giles	e7aa979303	bugfix: wrong log compression limit check operator	2017-08-15 08:33:15 +03:00
Oliver Giles	b307e06a87	use comma as a tag separator instead of space	2017-08-15 08:33:15 +03:00
Oliver Giles	56d2f30976	align abstract socket address syntax to new capnp	2017-08-15 08:33:07 +03:00
Oliver Giles	c12fb3f030	remove unnecessary default parameter	2017-08-12 15:10:06 +03:00
Oliver Giles	eda906b805	refactor: remove transport knowledge from Laminar class Improve the boundary between RpcImpl and LaminarInterface such that the Laminar class doesn't require any types from kj/async.h. The necessary logic moved from Laminar to RpcImpl and the notification now happens by abstract virtual callback instead of kj::Promise. Also remove the fairly useless 'wait' RPC call and drop the wrappers around kj::PromiseFulfillerPair	2017-08-10 08:25:20 +03:00
Oliver Giles	ab99af7ca7	implement general-purpose locks	2017-08-10 07:40:30 +03:00
Oliver Giles	f42325b472	implement .init script to populate workspace	2017-08-07 08:15:35 +03:00
Oliver Giles	4fc2310ed9	allow Run::addScript to accept a CWD for scripts	2017-08-07 08:07:50 +03:00
Oliver Giles	ae213b4f74	assymetric queueing logic allow tagged job execution on an untagged node, but not vice-versa. This allows the admin to assign tags for UI grouping without worrying about nodes at all	2017-08-06 08:21:17 +03:00
Oliver Giles	9aa172e8f5	adapt nodes and tags to new folder structure	2017-08-06 08:19:58 +03:00
Oliver Giles	b45de55ed1	bugfix: correct path to node .before script	2017-08-06 08:19:00 +03:00
Oliver Giles	1bd07acfc6	update dependencies to latest versions	2017-07-31 08:58:06 +03:00
Oliver Giles	66b62f70f3	only compress logs larger than a certain size this fixes an issue where empty or very small logs resulted in a larger compressed log, which was truncated and cannot be decompressed	2017-07-31 08:56:58 +03:00
Oliver Giles	3068180f8e	give capnp ownership of process output fd this fixes an intermittent issue (race condition?) where the IoContext attempts to poll an already-closed fd	2017-07-31 08:53:50 +03:00
Oliver Giles	668ada74d1	move from directory-based to file-based job scripts	2017-07-31 08:51:46 +03:00
Oliver Giles	1bcb2c8dfe	remove no longer used frontend templates	2017-07-31 08:31:43 +03:00
Oliver Giles	8080d38cfe	fix reported estimated time of completion from websocket	2017-07-13 21:59:59 +03:00
Oliver Giles	492ddd2ceb	"Laminar" as default page title	2017-07-13 21:59:59 +03:00
Oliver Giles	ad9837fd96	frontend: replace angular with vue	2017-07-13 21:59:59 +03:00
Oliver Giles	56bc2581bf	v0.3	2016-07-29 12:41:14 +03:00
Oliver Giles	b8d172fa2b	change docker script to build for debian	2016-07-26 13:02:58 +03:00
Oliver Giles	4e911756bc	update copyright year	2016-07-25 15:00:49 +03:00
Oliver Giles	2ea27d46ed	implement proper child cleanup	2016-07-25 14:59:45 +03:00
Oliver Giles	7b7de751e3	fix for new non-COW std::strings	2016-07-23 18:07:33 +03:00
Oliver Giles	c502bdfdc3	use hyphen in deb pkg name	2015-12-06 14:12:12 +01:00