update UserManual for 0.6

As implemented in #36

CMakeLists.txt

@@ -1,5 +1,5 @@
 ###
-### Copyright 2015 Oliver Giles
+### Copyright 2015-2017 Oliver Giles
 ###
 ### This file is part of Laminar
 ###
@@ -18,6 +18,7 @@
 ###
 project(laminar)
 cmake_minimum_required(VERSION 2.8)
+cmake_policy(SET CMP0058 NEW)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
@@ -57,15 +58,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)
+
 # 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 +74,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
@@ -90,6 +88,16 @@ target_link_libraries(laminard capnp-rpc capnp kj-async kj pthread boost_filesys
 add_executable(laminarc src/client.cpp laminar.capnp.c++)
 target_link_libraries(laminarc capnp-rpc capnp kj-async kj pthread)
 
+## Tests
+set(BUILD_TESTS FALSE CACHE BOOL "Build tests")
+if(BUILD_TESTS)
+    find_package(GTest REQUIRED)
+    include_directories(${GTEST_INCLUDE_DIRS} src)
+    add_executable(laminar-tests src/conf.cpp src/database.cpp src/laminar.cpp src/run.cpp src/server.cpp laminar.capnp.c++ src/resources.cpp ${COMPRESSED_BINS} test/test-conf.cpp test/test-database.cpp test/test-laminar.cpp test/test-run.cpp test/test-server.cpp)
+    target_link_libraries(laminar-tests ${GTEST_BOTH_LIBRARIES} gmock capnp-rpc capnp kj-async kj pthread boost_filesystem boost_system sqlite3 z)
+endif()
+
+set(SYSTEMD_UNITDIR /lib/systemd/system CACHE PATH "Path to systemd unit files")
 install(TARGETS laminard laminarc RUNTIME DESTINATION usr/bin)
-install(FILES laminar.service DESTINATION usr/lib/systemd/system)
+install(FILES laminar.service DESTINATION ${SYSTEMD_UNITDIR})
 install(FILES laminar.conf DESTINATION etc)

COPYING

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,11 +1,24 @@
-## 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 (http://laminar.ohwg.net) is a lightweight and modular Continuous Integration service for Linux. It is self-hosted and developer-friendly, eschewing a configuration 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 [guide](http://laminar.ohwg.net/docs.html) should be straightforward for anyone with even very basic Linux server administration experience.
+
+See [the website](http://laminar.ohwg.net) and the [documentation](http://laminar.ohwg.net/docs.html) for more information.
+
+## Building from source
+
+First install development packages for `capnproto (git)`, `rapidjson`, `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.
 

UserManual.md

@@ -0,0 +1,603 @@
+# Introduction
+
+[Laminar](http://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.
+
+Laminar encourages the use of existing GNU/Linux tools such as `bash` and `cron` instead of reinventing them.
+
+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.
+
+Throughout this document, the fixed base path `/var/lib/laminar` is used. This is the default path and can be changed by setting `LAMINAR_HOME` in `/etc/laminar.conf` as desired.
+
+## Terminology
+
+- *job*: a task, identified by a name, comprising of one or more executable scripts.
+- *run*: a numbered execution of a *job*
+
+---
+
+# Installing Laminar
+
+Pre-built packages are available for Debian 9 (Stretch) and CentOS 7 on x86_64. Alternatively, Laminar may be built from source for any Linux distribution.
+
+## Installation from binaries
+
+Alternatively to the source-based approach shown above, precompiled packages are supplied for x86_64 Debian 9 (Stretch) and CentOS 7
+
+Under Debian:
+
+```bash
+wget https://github.com/ohwgiles/laminar/releases/download/0.6/laminar-0.6-1-amd64.deb
+sudo apt install laminar-0.6-1-amd64.deb
+```
+
+Under CentOS:
+
+```bash
+wget https://github.com/ohwgiles/laminar/releases/download/0.5/laminar-0.6-1.x86_64.rpm
+sudo yum install laminar-0.6-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.
+
+## Building from source
+
+See the [development README](https://github.com/ohwgiles/laminar) for instructions for installing from source.
+
+---
+
+# 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), run laminar as a reverse proxy behind a regular webserver.
+
+## Running behind a reverse proxy
+
+Laminar relies on WebSockets to provide a responsive, auto-updating display without polling. This may require extra support from your frontend webserver.
+
+For nginx, see [NGINX Reverse Proxy](https://www.nginx.com/resources/admin-guide/reverse-proxy/) and [WebSocket proxying](http://nginx.org/en/docs/http/websocket.html).
+
+For Apache, see [Apache Reverse Proxy](https://httpd.apache.org/docs/2.4/howto/reverse_proxy.html) and [mod_proxy_wstunnel](https://httpd.apache.org/docs/2.4/mod/mod_proxy_wstunnel.html).
+
+If you use [artefacts](#Archiving-artefacts), note that Laminar is not designed as a file server, and better performance will be achieved by allowing the frontend web server to directly serve the archive directory directly (e.g. using a `Location` directive).
+
+## Set the page title
+
+Change `LAMINAR_TITLE` in `/etc/laminar.conf` to your preferred page title. For further WebUI customization, consider using a [custom style sheet](#Customizing-the-WebUI).
+
+## More configuration options
+
+See the [reference section](#Service-configuration-file)
+
+---
+
+# Defining 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
+```
+
+Laminar uses your script's exit code to determine whether to mark the run as successful or failed. If your script is written in bash, the [`-e` option](http://tldp.org/LDP/abs/html/options.html) is helpful for this. See also [Exit and Exit Status](http://tldp.org/LDP/abs/html/exit-status.html).
+
+Don't forget to mark the script executable:
+
+```bash
+chmod +x /var/lib/laminar/cfg/hello.run
+```
+
+---
+
+# Triggering a run
+
+When triggering a run, the job is first added to a queue of upcoming tasks. If the server is busy, the job may wait in this queue for a while. It will only be assigned a job number when it leaves this queue and starts executing. The job number may be useful to the client that triggers the run, so there are a few ways to trigger a run.
+
+To add the `hello` job to the queue ("fire-and-forget"), execute
+
+```bash
+laminarc queue hello
+```
+
+In this case, laminarc returns immediately, with its error code indicating whether adding the job to the queue was sucessful.
+
+To queue the job and wait until it leaves the queue and starts executing, use
+
+```bash
+laminarc start hello
+```
+
+In this case, laminarc blocks until the job starts executing, or returns immediately if queueing failed. The run number will be printed to standard output.
+
+To launch and run the `hello` job to completion, execute
+
+```bash
+laminarc run hello
+```
+
+In all cases, a started run means the `/var/lib/laminar/cfg/hello.run` script will be executed, with a working directory of `/var/lib/laminar/run/hello/1` (or current run number)
+
+The result and log output should be visible in the Web UI at http://localhost:8080/jobs/hello/1
+
+Also note that all the above commands can simultaneously trigger multiple different jobs:
+
+```bash
+laminarc queue test-host test-target
+```
+
+## Isn't there a "Build Now" button I can click?
+
+This is against the design principles of Laminar and was deliberately excluded. Laminar's web UI is strictly read-only, making it simple to deploy in mixed-permission or public environments without an authentication layer. Furthermore, Laminar tries to encourage ideal continuous integration, where manual triggering is an anti-pattern. Want to make a release? Push a git tag and implement a post-receive hook. Want to re-run a build due to sporadic failure/flaky tests? Fix the tests locally and push a patch. Experience shows that a manual trigger such as a "Build Now" button is often used as a crutch to avoid doing the correct thing, negatively impacting traceability and quality.
+
+## 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 queue 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 queue 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 `LAMINAR_BIND_HTTP`.
+
+Then, point `laminarc` to the new location using an environment variable:
+
+```bash
+LAMINAR_HOST=192.168.1.1:9997 laminarc queue example
+```
+
+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.
+
+## Triggering on a push to GitHub
+
+Consider using [webhook](https://github.com/adnanh/webhook) or a similar application to call `laminarc`.
+
+---
+
+# 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.
+
+```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 run 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 run example-downstream-special
+else
+  laminarc run example-downstream-regular
+fi
+
+laminarc run example-test-$TARGET_PLATFORM
+```
+
+`laminarc` reads the `$JOB` and `$RUN` variables set by `laminard` and passes them as part of the queue/start/run 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 queue example foo=bar
+```
+
+In `/var/lib/laminar/cfg/jobs/example.run`:
+
+```bash
+#!/bin/bash
+if [ "$foo" == "bar" ]; then
+   ...
+else
+   ...
+fi
+```
+
+---
+
+# Pre- and post-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.
+
+Similarly, if the script `/var/lib/laminar/cfg/jobs/example.after` script exists, it will be executed as part of the `example` job, after the primary `var/lib/laminar/cfg/jobs/example.run` script. In this script, the `$RESULT` variable will be `success`, `failed`, or `aborted` according to the result of `example.run`.
+
+See also [script execution order](#Script-execution-order)
+
+
+## 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 queue example-test
+fi
+```
+
+## Passing data between 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`
+
+```bash
+#!/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).
+
+---
+
+# 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.
+
+
+## Accessing artefacts 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 queue "$@"
+fi
+```
+
+With this in place, any `.after` script can conditionally trigger a downstream job more succinctly:
+
+```bash
+success_trigger example-test
+```
+
+Another excellent candidate for helper scripts is automatically sending notifications on job status change.
+
+---
+
+# 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 artefact (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.
+
+---
+
+# Abort on timeout
+
+To configure a maximum execution time in seconds for a job, add a line to `/var/lib/laminar/cfg/jobs/JOBNAME.conf`:
+
+```
+TIMEOUT=120
+```
+
+---
+
+# 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.conf` 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`.
+
+---
+
+# 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 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 copy (hard-link) 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
+```
+
+---
+
+# Customizing the WebUI
+
+If it exists, the file `/var/lib/laminar/custom/style.css` will be served by laminar and may be used to change the appearance of Laminar's WebUI.
+
+This directory is also a good place to add any extra assets needed for this customization, but note that in this case you will need to serve this directory directly from your [HTTP reverse proxy](#Service-configuration) (highly recommended).
+
+---
+
+# Reference
+
+## Service configuration file
+
+`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_RUNDIRS`: Set to an integer defining how many rundirs to keep per job. The lowest-numbered ones will be deleted. The default is 0, meaning all run dirs will be immediately deleted.
+- `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 executed:
+
+- `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` integer number of this *run*
+- `JOB` string name of this *job*
+- `RESULT` string run status: "success", "failed", etc.
+- `LAST_RESULT` string previous run status
+- `WORKSPACE` path to this job's workspace
+- `ARCHIVE` path to this run's 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 queue`, `laminarc start` or `laminarc run` will be available. See [parameterized runs](#Parameterized-runs)
+
+## laminarc
+
+`laminarc` commands are:
+
+- `queue [JOB [PARAMS...]]...` adds one or more jobs to the queue with optional parameters, returning immediately.
+- `start [JOB [PARAMS...]]...` starts one or more jobs with optional parameters, returning when the jobs begin execution.
+- `run [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`.

docker-build-centos.sh

@@ -1,42 +1,46 @@
-#!/bin/bash
-
-VERSION=0.2
+#!/bin/bash -e
 
 OUTPUT_DIR=$PWD
 
 SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 
-docker run --rm -i -v $SOURCE_DIR:/root/rpmbuild/SOURCES/laminar-$VERSION:ro -v $OUTPUT_DIR:/output centos bash -xe <<EOS
+VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty | tr - .)
 
-yum -y install rpm-build cmake make gcc gcc-c++ wget sqlite-devel boost-devel zlib-devel
+DOCKER_TAG=$(docker build -q - <<EOS
+FROM centos:7
+RUN yum -y install epel-release && yum -y install rpm-build cmake3 make gcc gcc-c++ wget sqlite-devel boost-devel zlib-devel
+EOS
+)
+
+docker run --rm -i -v $SOURCE_DIR:/root/rpmbuild/SOURCES/laminar-$VERSION:ro -v $OUTPUT_DIR:/output $DOCKER_TAG bash -xe <<EOS
 
 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/3079784bfaf3ba05edacfc63d6d494b76a85a3a5.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
+c5c04c1892a381e30bd032a6bceef111  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-3079784bfaf3ba05edacfc63d6d494b76a85a3a5/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
@@ -47,7 +51,7 @@ Version: $VERSION
 Release: 1
 License: GPL
 BuildRequires: systemd-units
-Requires: boost-filesystem zlib
+Requires: sqlite boost-filesystem zlib
 
 %description
 Lightweight Continuous Integration Service
@@ -55,7 +59,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=/ -DSYSTEMD_UNITDIR=%{_unitdir} %{_sourcedir}/laminar-$VERSION
 pwd
 make
 

docker-build-debian.sh

@@ -1,42 +1,45 @@
-#!/bin/bash
-
-VERSION=0.2
+#!/bin/bash -e
 
 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)
 
-apt-get update
-apt-get install -y wget cmake g++ libsqlite3-dev libboost-filesystem1.55-dev zlib1g-dev
+DOCKER_TAG=$(docker build -q - <<EOS
+FROM debian:9-slim
+RUN apt-get update && apt-get install -y wget cmake g++ libsqlite3-dev libboost-filesystem1.62-dev zlib1g-dev
+EOS
+)
+
+docker run --rm -i -v $SOURCE_DIR:/laminar:ro -v $OUTPUT_DIR:/output $DOCKER_TAG bash -xe <<EOS
 
 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/3079784bfaf3ba05edacfc63d6d494b76a85a3a5.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
+c5c04c1892a381e30bd032a6bceef111  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-3079784bfaf3ba05edacfc63d6d494b76a85a3a5/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 +57,7 @@ Section:
 Priority: optional
 Architecture: amd64
 Maintainer: Oliver Giles <web ohwg net>
-Depends: libboost-filesystem1.55.0, zlib1g
+Depends: libsqlite3-0, libboost-filesystem1.62.0, zlib1g
 Description: Lightweight Continuous Integration Service
 EOF
 cat <<EOF > laminar/DEBIAN/postinst
@@ -67,5 +70,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

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
 ###
@@ -16,12 +33,15 @@
 #LAMINAR_TITLE=
 
 ###
-### LAMINAR_KEEP_WORKDIR
+### LAMINAR_KEEP_RUNDIRS
 ###
-### If set (to anything), the job workdir $LAMINAR_HOME/run/$JOB/$NUM
-### will not be deleted after the run has completed
+### Setting this prevents the immediate deletion of job rundirs
+### $LAMINAR_HOME/run/$JOB/$RUN. Value should be an integer represeting
+### the number of rundirs to keep.
 ###
-#LAMINAR_KEEP_WORKDIR=1
+### Default: 0
+###
+#LAMINAR_KEEP_RUNDIRS=0
 
 ###
 ### LAMINAR_ARCHIVE_URL

src/client.cpp

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-2017 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,31 +71,29 @@ 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>();
 
     auto& waitScope = client.getWaitScope();
 
-    if(strcmp(argv[1], "trigger") == 0) {
+    if(strcmp(argv[1], "queue") == 0) {
         if(argc < 3) {
-            fprintf(stderr, "Usage %s trigger <jobName>\n", argv[0]);
+            fprintf(stderr, "Usage %s queue <jobName>\n", argv[0]);
             return EINVAL;
         }
-        kj::Vector<capnp::RemotePromise<LaminarCi::TriggerResults>> promises;
+        kj::Vector<capnp::RemotePromise<LaminarCi::QueueResults>> promises;
         int jobNameIndex = 2;
         // make a request for each job specified on the commandline
         do {
-            auto req = laminar.triggerRequest();
+            auto req = laminar.queueRequest();
             req.setJobName(argv[jobNameIndex]);
             int n = setParams(argc - jobNameIndex - 1, &argv[jobNameIndex + 1], req);
             promises.add(req.send());
@@ -108,27 +106,58 @@ int main(int argc, char** argv) {
                 return ENOENT;
             }
         }
-    } else if(strcmp(argv[1], "start") == 0) {
+    } else if(strcmp(argv[1], "start") == 0 || strcmp(argv[1], "trigger") == 0) {
+        if(strcmp(argv[1], "trigger") == 0)
+            fprintf(stderr, "Warning: 'trigger' is deprecated, use 'queue' for the old behavior\n");
         if(argc < 3) {
-            fprintf(stderr, "Usage %s start <jobName>\n", argv[0]);
+            fprintf(stderr, "Usage %s queue <jobName>\n", argv[0]);
             return EINVAL;
         }
         kj::Vector<capnp::RemotePromise<LaminarCi::StartResults>> promises;
+        struct: public kj::TaskSet::ErrorHandler {
+            void taskFailed(kj::Exception&&) override {}
+        } ignoreFailed;
+        kj::TaskSet ts(ignoreFailed);
         int jobNameIndex = 2;
         // make a request for each job specified on the commandline
         do {
             auto req = laminar.startRequest();
             req.setJobName(argv[jobNameIndex]);
             int n = setParams(argc - jobNameIndex - 1, &argv[jobNameIndex + 1], req);
-            promises.add(req.send());
+            ts.add(req.send().then([&ret,argv,jobNameIndex](capnp::Response<LaminarCi::StartResults> resp){
+                if(resp.getResult() != LaminarCi::MethodResult::SUCCESS) {
+                    fprintf(stderr, "Failed to start job '%s'\n", argv[2]);
+                    ret = ENOENT;
+                }
+                printf("%s:%d\n", argv[jobNameIndex], resp.getBuildNum());
+            }));
             jobNameIndex += n + 1;
         } while(jobNameIndex < argc);
-        // pend on the promises
-        for(auto& p : promises) {
-            if(p.wait(waitScope).getResult() != LaminarCi::JobResult::SUCCESS) {
-                ret = EFAILED;
-            }
+        ts.onEmpty().wait(waitScope);
+    } else if(strcmp(argv[1], "run") == 0) {
+        if(argc < 3) {
+            fprintf(stderr, "Usage %s run <jobName>\n", argv[0]);
+            return EINVAL;
         }
+        struct: public kj::TaskSet::ErrorHandler {
+            void taskFailed(kj::Exception&&) override {}
+        } ignoreFailed;
+        kj::TaskSet ts(ignoreFailed);
+        int jobNameIndex = 2;
+        // make a request for each job specified on the commandline
+        do {
+            auto req = laminar.runRequest();
+            req.setJobName(argv[jobNameIndex]);
+            int n = setParams(argc - jobNameIndex - 1, &argv[jobNameIndex + 1], req);
+            ts.add(req.send().then([&ret,argv,jobNameIndex](capnp::Response<LaminarCi::RunResults> resp){
+                printf("%s:%d\n", argv[jobNameIndex], resp.getBuildNum());
+                if(resp.getResult() != LaminarCi::JobResult::SUCCESS) {
+                    ret = EFAILED;
+                }
+            }));
+            jobNameIndex += n + 1;
+        } while(jobNameIndex < argc);
+        ts.onEmpty().wait(waitScope);
     } else if(strcmp(argv[1], "set") == 0) {
         if(argc < 3) {
             fprintf(stderr, "Usage %s set param=value\n", argv[0]);
@@ -136,8 +165,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,18 +177,19 @@ 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]);
+        fprintf(stderr, "Unknown command %s\n", argv[1]);
         return EINVAL;
     }
 

src/conf.cpp

@@ -25,13 +25,13 @@ int StringMap::convert(std::string e) { return atoi(e.c_str()); }
 
 StringMap parseConfFile(const char* path) {
     StringMap result;
-    std::fstream f(path);
+    std::ifstream f(path);
     std::string line;
     while(std::getline(f, line)) {
         if(line[0] == '#')
             continue;
-        int p = line.find('=');
-        if(p > 0) {
+        size_t p = line.find('=');
+        if(p != std::string::npos) {
             result.emplace(line.substr(0, p), line.substr(p+1));
         }
     }

src/conf.h

@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_CONF_H_
-#define _LAMINAR_CONF_H_
+#ifndef LAMINAR_CONF_H_
+#define LAMINAR_CONF_H_
 
 #include <unordered_map>
 
@@ -41,4 +41,4 @@ int StringMap::convert(std::string e);
 StringMap parseConfFile(const char* path);
 
 
-#endif // _LAMINAR_CONF_H_
+#endif // LAMINAR_CONF_H_

src/database.cpp

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -29,8 +29,10 @@ Database::~Database() {
     sqlite3_close(hdl);
 }
 
-Database::Statement::Statement(sqlite3 *db, const char *query) {
-    sqlite3_prepare_v2(db, query, -1, &stmt, NULL);
+Database::Statement::Statement(sqlite3 *db, const char *query) :
+    stmt(nullptr)
+{
+    sqlite3_prepare_v2(db, query, -1, &stmt, nullptr);
 }
 
 Database::Statement::~Statement() {
@@ -39,38 +41,59 @@ Database::Statement::~Statement() {
 
 
 bool Database::Statement::exec() {
-    return sqlite3_step(stmt) == SQLITE_OK;
+    return sqlite3_step(stmt) == SQLITE_DONE;
 }
 
 void Database::Statement::bindValue(int i, int e) {
     sqlite3_bind_int(stmt, i, e);
 }
 
-void Database::Statement::bindValue(int i, const char* e) {
-    sqlite3_bind_text(stmt, i, e, -1, NULL);
+void Database::Statement::bindValue(int i, uint e) {
+    sqlite3_bind_int(stmt, i, static_cast<int32_t>(e));
 }
 
-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, long e) {
+    sqlite3_bind_int64(stmt, i, e);
+}
+
+void Database::Statement::bindValue(int i, ulong e) {
+    sqlite3_bind_int64(stmt, i, static_cast<int64_t>(e));
+}
+
+void Database::Statement::bindValue(int i, const char* e) {
+    sqlite3_bind_text(stmt, i, e, -1, nullptr);
+}
+
+void Database::Statement::bindValue(int i, const std::string& e) {
+    sqlite3_bind_text(stmt, i, e.data(), static_cast<int>(e.size()), nullptr);
 }
 
 template<> std::string Database::Statement::fetchColumn(int col) {
-    int sz = sqlite3_column_bytes(stmt, col);
+    uint sz = static_cast<uint>(sqlite3_column_bytes(stmt, col)); // according to documentation will never be negative
     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;
 }
 
 template<> const char* Database::Statement::fetchColumn(int col) {
-    return (char*)sqlite3_column_text(stmt, col);
+    // while sqlite3_column_text maybe more correctly returns an unsigned const char*, signed const char* is more consistent
+    return reinterpret_cast<const char*>(sqlite3_column_text(stmt, col));
 }
 
 template<> int Database::Statement::fetchColumn(int col) {
     return sqlite3_column_int(stmt, col);
 }
 
-template<> time_t Database::Statement::fetchColumn(int col) {
-    return sqlite3_column_int64(stmt, col);
+template<> uint Database::Statement::fetchColumn(int col) {
+    return static_cast<uint>(sqlite3_column_int(stmt, col));
+}
+
+template<> long Database::Statement::fetchColumn(int col) {
+    return static_cast<long>(sqlite3_column_int64(stmt, col));
+}
+
+template<> ulong Database::Statement::fetchColumn(int col) {
+    return static_cast<ulong>(sqlite3_column_int64(stmt, col));
 }
 
 bool Database::Statement::row() {

src/database.h

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-2016 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_DATABASE_H_
-#define _LAMINAR_DATABASE_H_
+#ifndef LAMINAR_DATABASE_H_
+#define LAMINAR_DATABASE_H_
 
 #include <string>
 #include <functional>
@@ -52,12 +52,20 @@ private:
 
     public:
         Statement(sqlite3* db, const char* query);
+        Statement(const Statement&) =delete;
+        Statement(Statement&& other) {
+            stmt = other.stmt;
+            other.stmt = nullptr;
+        }
         ~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
@@ -95,12 +103,12 @@ private:
             }
         };
         template<typename...Args>
-        friend class FetchMarshaller;
+        friend struct FetchMarshaller;
 
         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...);
         }
@@ -111,8 +119,11 @@ private:
 
         // Bind value specializations
         void bindValue(int i, int e);
+        void bindValue(int i, uint e);
+        void bindValue(int i, long e);
+        void bindValue(int i, unsigned long 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
@@ -137,6 +148,8 @@ private:
 template<> std::string Database::Statement::fetchColumn(int col);
 template<> const char* Database::Statement::fetchColumn(int col);
 template<> int Database::Statement::fetchColumn(int col);
-template<> time_t Database::Statement::fetchColumn(int col);
+template<> uint Database::Statement::fetchColumn(int col);
+template<> long Database::Statement::fetchColumn(int col);
+template<> ulong Database::Statement::fetchColumn(int col);
 
-#endif // _LAMINAR_DATABASE_H_
+#endif // LAMINAR_DATABASE_H_

src/interface.h

@@ -16,13 +16,11 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef INTERFACE_H
-#define INTERFACE_H
+#ifndef LAMINAR_INTERFACE_H_
+#define LAMINAR_INTERFACE_H_
 
 #include "run.h"
 
-#include <kj/async.h>
-
 #include <string>
 #include <memory>
 #include <unordered_map>
@@ -41,55 +39,56 @@ struct MonitorScope {
         LOG   // a run's log page
     };
 
-    MonitorScope(Type type = HOME, std::string job = std::string(), int num = 0) :
+    MonitorScope(Type type = HOME, std::string job = std::string(), uint num = 0) :
         type(type),
         job(job),
         num(num)
     {}
 
     // whether this scope wants status information about the given job or run
-    bool wantsStatus(std::string ajob, int anum = 0) const {
+    bool wantsStatus(std::string ajob, uint anum = 0) const {
         if(type == HOME || type == ALL) return true;
         if(type == JOB) return ajob == job;
         if(type == RUN) return ajob == job && anum == num;
         return false;
     }
 
-    bool wantsLog(std::string ajob, int anum) const {
+    bool wantsLog(std::string ajob, uint anum) const {
         return type == LOG && ajob == job && anum == num;
     }
 
     Type type;
     std::string job;
-    int num = 0;
+    uint num = 0;
 };
 
 // Represents a (websocket) client that wants to be notified about events
 // matching the supplied scope. Pass instances of this to LaminarInterface
 // registerClient and deregisterClient
 struct LaminarClient {
+    virtual ~LaminarClient() =default;
     virtual void sendMessage(std::string payload) = 0;
-    virtual void close(bool now = true) = 0;
     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 ~LaminarWaiter() =default;
+    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.
 struct LaminarInterface {
+    virtual ~LaminarInterface() =default;
+
     // Queues a job, returns immediately. Return value will be nullptr if
     // 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 +98,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.
@@ -107,13 +114,27 @@ struct LaminarInterface {
     // Implements the laminar client interface allowing the setting of
     // arbitrary parameters on a run (usually itself) to be available in
     // the environment of subsequent scripts.
-    virtual bool setParam(std::string job, int buildNum, std::string param, std::string value) = 0;
+    virtual bool setParam(std::string job, uint buildNum, std::string param, std::string value) = 0;
 
     // Fetches the content of an artifact given its filename relative to
     // $LAMINAR_HOME/archive. This shouldn't be used, because the sysadmin
     // should have configured a real webserver to serve these things.
     virtual bool getArtefact(std::string path, std::string& result) = 0;
+
+    // Fetches the content of $LAMINAR_HOME/custom/style.css or an empty
+    // string. This shouldn't be used, because the sysadmin should have
+    // configured a real webserver to serve these things.
+    virtual std::string getCustomCss() = 0;
+
+    // Abort all running jobs
+    virtual void abortAll() = 0;
+
+    // Callback for laminar to reap child processes.
+    virtual void reapChildren() = 0;
+
+    // Callback to handle a configuration modification notification
+    virtual void notifyConfigChanged() = 0;
 };
 
-#endif // INTERFACE_H
+#endif // LAMINAR_INTERFACE_H_
 

src/laminar.capnp

@@ -2,10 +2,12 @@
 
 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);
+    queue @0 (jobName :Text, params :List(JobParam)) -> (result :MethodResult);
+    start @1 (jobName :Text, params :List(JobParam)) -> (result :MethodResult, buildNum :UInt32);
+    run @2 (jobName :Text, params :List(JobParam)) -> (result :JobResult, buildNum :UInt32);
     set @3 (jobName :Text, buildNum :UInt32, param :JobParam) -> (result :MethodResult);
+    lock @4 (lockName :Text) -> ();
+    release @5 (lockName :Text) -> ();
 
     struct JobParam {
         name @0 :Text;

src/laminar.cpp

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-2018 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -28,6 +28,8 @@
 #include <boost/filesystem.hpp>
 namespace fs = boost::filesystem;
 
+#define COMPRESS_LOG_MIN_SIZE 1024
+
 #include <rapidjson/stringbuffer.h>
 #include <rapidjson/writer.h>
 
@@ -38,7 +40,7 @@ class Json : public rapidjson::Writer<rapidjson::StringBuffer> {
 public:
     Json() : rapidjson::Writer<rapidjson::StringBuffer>(buf) { StartObject(); }
     template<typename T>
-    Json& set(const char* key, T value);
+    Json& set(const char* key, T value) { String(key); Int64(value); return *this; }
     Json& startObject(const char* key) { String(key); StartObject(); return *this; }
     Json& startArray(const char* key) { String(key); StartArray(); return *this; }
     const char* str() { EndObject(); return buf.GetString(); }
@@ -47,23 +49,28 @@ private:
 };
 template<> Json& Json::set(const char* key, const char* value) { String(key); String(value); return *this; }
 template<> Json& Json::set(const char* key, std::string value) { String(key); String(value.c_str()); return *this; }
-template<> Json& Json::set(const char* key, int value) { String(key); Int(value); return *this; }
-template<> Json& Json::set(const char* key, time_t value) { String(key); Int64(value); return *this; }
 
 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() {
     archiveUrl = ARCHIVE_URL_DEFAULT;
     if(char* envArchive = getenv("LAMINAR_ARCHIVE_URL"))
         archiveUrl = envArchive;
-    eraseWorkdir = true;
+    numKeepRunDirs = 0;
     homeDir = getenv("LAMINAR_HOME") ?: "/var/lib/laminar";
 
     db = new Database((fs::path(homeDir)/"laminar.sqlite").string().c_str());
@@ -79,14 +86,14 @@ Laminar::Laminar() {
 
     // retrieve the last build numbers
     db->stmt("SELECT name, MAX(number) FROM builds GROUP BY name")
-    .fetch<str,int>([this](str name, int build){
+    .fetch<str,uint>([this](str name, uint build){
         buildNums[name] = build;
     });
 
-    // This is only a separate function because I imagined that it would
-    // be nice to reload some configuration during runtime without restarting
-    // the server completely. Currently not called from anywhere else
-    // TODO: implement that
+    srv = nullptr;
+
+    // Load configuration, may be called again in response to an inotify event
+    // that the configuration files have been modified
     loadConfiguration();
 }
 
@@ -98,7 +105,15 @@ void Laminar::deregisterClient(LaminarClient* client) {
     clients.erase(client);
 }
 
-bool Laminar::setParam(std::string job, int buildNum, std::string param, std::string value) {
+void Laminar::registerWaiter(LaminarWaiter *waiter) {
+    waiters.insert(waiter);
+}
+
+void Laminar::deregisterWaiter(LaminarWaiter *waiter) {
+    waiters.erase(waiter);
+}
+
+bool Laminar::setParam(std::string job, uint buildNum, std::string param, std::string value) {
     if(Run* run = activeRun(job, buildNum)) {
         run->params[param] = value;
         return true;
@@ -107,11 +122,11 @@ bool Laminar::setParam(std::string job, int buildNum, std::string param, std::st
 }
 
 
-void Laminar::populateArtifacts(Json &j, std::string job, int num) const {
+void Laminar::populateArtifacts(Json &j, std::string job, uint num) const {
     fs::path dir(fs::path(homeDir)/"archive"/job/std::to_string(num));
     if(fs::is_directory(dir)) {
-        int prefixLen = (fs::path(homeDir)/"archive").string().length();
-        int scopeLen = dir.string().length();
+        size_t prefixLen = (fs::path(homeDir)/"archive").string().length();
+        size_t scopeLen = dir.string().length();
         for(fs::recursive_directory_iterator it(dir); it != fs::recursive_directory_iterator(); ++it) {
             if(!fs::is_regular_file(*it))
                 continue;
@@ -131,14 +146,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) {
-                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);
+              .fetch<str,int>([=](str maybeZipped, unsigned long sz) {
+                str log(sz+1,'\0');
+                if(sz >= COMPRESS_LOG_MIN_SIZE) {
+                    int res = ::uncompress((uint8_t*) log.data(), &sz,
+                         (const uint8_t*) 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 +165,9 @@ void Laminar::sendStatus(LaminarClient* client) {
 
     Json j;
     j.set("type", "status");
+    j.set("title", getenv("LAMINAR_TITLE") ?: "Laminar");
+    j.set("time", time(nullptr));
     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)
@@ -155,7 +175,6 @@ void Laminar::sendStatus(LaminarClient* client) {
             j.set("queued", started-queued);
             j.set("started", started);
             j.set("completed", completed);
-            j.set("duration", completed-started);
             j.set("result", to_string(RunState(result)));
             j.set("reason", reason);
         });
@@ -166,8 +185,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<uint>([&](uint lastRuntime){
+                j.set("etc", run->startedAt + lastRuntime);
             });
         }
         j.set("latestNum", int(buildNums[client->scope.job]));
@@ -178,10 +197,10 @@ void Laminar::sendStatus(LaminarClient* client) {
         j.startArray("recent");
         db->stmt("SELECT number,startedAt,completedAt,result,reason FROM builds WHERE name = ? ORDER BY completedAt DESC LIMIT 25")
         .bind(client->scope.job)
-        .fetch<int,time_t,time_t,int,str>([&](int build,time_t started,time_t completed,int result,str reason){
+        .fetch<uint,time_t,time_t,int,str>([&](uint build,time_t started,time_t completed,int result,str reason){
             j.StartObject();
             j.set("number", build)
-             .set("duration", completed - started)
+             .set("completed", completed)
              .set("started", started)
              .set("result", to_string(RunState(result)))
              .set("reason", reason)
@@ -189,7 +208,7 @@ void Laminar::sendStatus(LaminarClient* client) {
         });
         j.EndArray();
         j.startArray("running");
-        auto p = activeJobs.get<4>().equal_range(client->scope.job);
+        auto p = activeJobs.byJobName().equal_range(client->scope.job);
         for(auto it = p.first; it != p.second; ++it) {
             const std::shared_ptr<Run> run = *it;
             j.StartObject();
@@ -202,7 +221,7 @@ void Laminar::sendStatus(LaminarClient* client) {
         }
         j.EndArray();
         int nQueued = 0;
-        for(const std::shared_ptr<Run> run : queuedJobs) {
+        for(const auto& run : queuedJobs) {
             if (run->name == client->scope.job) {
                 nQueued++;
             }
@@ -225,11 +244,14 @@ void Laminar::sendStatus(LaminarClient* client) {
 
     } else if(client->scope.type == MonitorScope::ALL) {
         j.startArray("jobs");
-        db->stmt("SELECT name,number,startedAt,result FROM builds GROUP BY name ORDER BY number DESC")
-        .fetch<str,int,time_t,int>([&](str name,int number, time_t started, int result){
+        db->stmt("SELECT name,number,startedAt,completedAt,result FROM builds GROUP BY name ORDER BY number DESC")
+        .fetch<str,uint,time_t,time_t,int>([&](str name,uint number, time_t started, time_t completed, int result){
             j.StartObject();
             j.set("name", name);
-            j.set("number", number).set("result", to_string(RunState(result))).set("started", started);
+            j.set("number", number);
+            j.set("result", to_string(RunState(result)));
+            j.set("started", started);
+            j.set("completed", completed);
             j.startArray("tags");
             for(const str& t: jobTags[name]) {
                 j.String(t.c_str());
@@ -238,22 +260,37 @@ void Laminar::sendStatus(LaminarClient* client) {
             j.EndObject();
         });
         j.EndArray();
+        j.startArray("running");
+        for(const auto& run : activeJobs.byStartedAt()) {
+            j.StartObject();
+            j.set("name", run->name);
+            j.set("number", run->build);
+            j.set("node", run->node->name);
+            j.set("started", run->startedAt);
+            j.startArray("tags");
+            for(const str& t: jobTags[run->name]) {
+                j.String(t.c_str());
+            }
+            j.EndArray();
+            j.EndObject();
+        }
+        j.EndArray();
     } else { // Home page
         j.startArray("recent");
         db->stmt("SELECT * FROM builds ORDER BY completedAt DESC LIMIT 15")
-        .fetch<str,int,str,time_t,time_t,time_t,int>([&](str name,int build,str node,time_t,time_t started,time_t completed,int result){
+        .fetch<str,uint,str,time_t,time_t,time_t,int>([&](str name,uint build,str node,time_t,time_t started,time_t completed,int result){
             j.StartObject();
             j.set("name", name)
              .set("number", build)
              .set("node", node)
-             .set("duration", completed - started)
              .set("started", started)
+             .set("completed", completed)
              .set("result", to_string(RunState(result)))
              .EndObject();
         });
         j.EndArray();
         j.startArray("running");
-        for(const std::shared_ptr<Run> run : activeJobs.get<3>()) {
+        for(const auto& run : activeJobs.byStartedAt()) {
             j.StartObject();
             j.set("name", run->name);
             j.set("number", run->build);
@@ -261,14 +298,14 @@ 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<uint>([&](uint lastRuntime){
+                j.set("etc", run->startedAt + lastRuntime);
             });
             j.EndObject();
         }
         j.EndArray();
         j.startArray("queued");
-        for(const std::shared_ptr<Run> run : queuedJobs) {
+        for(const auto& run : queuedJobs) {
             j.StartObject();
             j.set("name", run->name);
             j.EndObject();
@@ -277,9 +314,9 @@ void Laminar::sendStatus(LaminarClient* client) {
         int execTotal = 0;
         int execBusy = 0;
         for(const auto& it : nodes) {
-            const Node& node = it.second;
-            execTotal += node.numExecutors;
-            execBusy += node.busyExecutors;
+            const std::shared_ptr<Node>& node = it.second;
+            execTotal += node->numExecutors;
+            execBusy += node->busyExecutors;
         }
         j.set("executorsTotal", execTotal);
         j.set("executorsBusy", execBusy);
@@ -287,7 +324,7 @@ void Laminar::sendStatus(LaminarClient* client) {
         for(int i = 6; i >= 0; --i) {
             j.StartObject();
             db->stmt("SELECT result, COUNT(*) FROM builds WHERE completedAt > ? AND completedAt < ? GROUP by result")
-                    .bind(86400*(time(0)/86400 - i), 86400*(time(0)/86400 - (i-1)))
+                    .bind(86400*(time(nullptr)/86400 - i), 86400*(time(nullptr)/86400 - (i-1)))
                     .fetch<int,int>([&](int result, int num){
                 j.set(to_string(RunState(result)).c_str(), num);
             });
@@ -296,15 +333,15 @@ void Laminar::sendStatus(LaminarClient* client) {
         j.EndArray();
         j.startObject("buildsPerJob");
         db->stmt("SELECT name, COUNT(*) FROM builds WHERE completedAt > ? GROUP BY name")
-                .bind(time(0) - 86400)
+                .bind(time(nullptr) - 86400)
                 .fetch<str, int>([&](str job, int count){
             j.set(job.c_str(), count);
         });
         j.EndObject();
         j.startObject("timePerJob");
         db->stmt("SELECT name, AVG(completedAt-startedAt) FROM builds WHERE completedAt > ? GROUP BY name")
-                .bind(time(0) - 7 * 86400)
-                .fetch<str, int>([&](str job, int time){
+                .bind(time(nullptr) - 7 * 86400)
+                .fetch<str, uint>([&](str job, uint time){
             j.set(job.c_str(), time);
         });
         j.EndObject();
@@ -325,82 +362,83 @@ void Laminar::run() {
     const char* listen_http = getenv("LAMINAR_BIND_HTTP") ?: INTADDR_HTTP_DEFAULT;
 
     srv = new Server(*this, listen_rpc, listen_http);
-
+    srv->addWatchPath(fs::path(fs::path(homeDir)/"cfg"/"nodes").string().c_str());
+    srv->addWatchPath(fs::path(fs::path(homeDir)/"cfg"/"jobs").string().c_str());
     srv->start();
 }
 
 void Laminar::stop() {
-    clients.clear();
     srv->stop();
 }
 
 bool Laminar::loadConfiguration() {
-    if(getenv("LAMINAR_KEEP_WORKDIR"))
-        eraseWorkdir = false;
+    if(const char* ndirs = getenv("LAMINAR_KEEP_RUNDIRS"))
+        numKeepRunDirs = static_cast<uint>(atoi(ndirs));
 
-    NodeMap nm;
+    std::set<std::string> knownNodes;
 
     fs::path nodeCfg = fs::path(homeDir)/"cfg"/"nodes";
 
     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(it->path().string().c_str());
 
-            StringMap conf = parseConfFile(config.path().string().c_str());
-
-            Node node;
-            node.name = it->path().filename().string();
-            node.numExecutors = conf.get<int>("EXECUTORS", 6);
+            std::string nodeName = it->path().stem().string();
+            auto existingNode = nodes.find(nodeName);
+            std::shared_ptr<Node> node = existingNode == nodes.end() ? nodes.emplace(nodeName, std::shared_ptr<Node>(new Node)).first->second : existingNode->second;
+            node->name = nodeName;
+            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()));
-                node.tags = tagList;
+                std::string tag;
+                while(std::getline(iss, tag, ','))
+                    tagList.insert(tag);
+                node->tags = tagList;
             }
 
-            nm.emplace(node.name, std::move(node));
+            knownNodes.insert(nodeName);
         }
     }
 
-    if(nm.empty()) {
-        // add a default node
-        Node node;
-        node.name = "";
-        node.numExecutors = 6;
-        nm.emplace("", std::move(node));
+    // remove any nodes whose config files disappeared.
+    // if there are no known nodes, take care not to remove and re-add the default node
+    for(auto it = nodes.begin(); it != nodes.end();) {
+        if((it->first == "" && knownNodes.size() == 0) || knownNodes.find(it->first) != knownNodes.end())
+            it++;
+        else
+            it = nodes.erase(it);
     }
 
-    nodes = nm;
+    // add a default node
+    if(nodes.empty()) {
+        std::shared_ptr<Node> node(new Node);
+        node->name = "";
+        node->numExecutors = 6;
+        nodes.emplace("", node);
+    }
 
     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,22 +448,14 @@ 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);
+    run->queuedAt = time(nullptr);
     for(auto it = params.begin(); it != params.end();) {
         if(it->first[0] == '=') {
             if(it->first == "=parentJob") {
@@ -460,69 +490,83 @@ 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){
-            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();});
+        srv->addDescriptor(run->fd, [this, run](const char* b,size_t n){
+            handleRunLog(run, std::string(b,n));
+        });
     }
     return complete;
 }
 
-void Laminar::reapAdvance() {
+void Laminar::handleRunLog(std::shared_ptr<Run> run, std::string s) {
+    run->log += s;
+    for(LaminarClient* c : clients) {
+        if(c->scope.wantsLog(run->name, run->build))
+            c->sendMessage(s);
+    }
+}
+
+// Reaps a zombie and steps the corresponding Run to its next state.
+// Should be called on SIGCHLD
+void Laminar::reapChildren() {
     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;
+    constexpr int bufsz = 1024;
+    static thread_local char buf[bufsz];
+    while((pid = waitpid(-1, &ret, WNOHANG)) > 0) {
         LLOG(INFO, "Reaping", pid);
-        auto it = activeJobs.get<0>().find(pid);
+        auto it = activeJobs.byPid().find(pid);
         std::shared_ptr<Run> run = *it;
+        // The main event loop might schedule this SIGCHLD handler before the final
+        // output handler (from addDescriptor). In that case, because it keeps a
+        // shared_ptr to the run it would successfully add to the log output buffer,
+        // but by then reapAdvance would have stored the log and ensured no-one cares.
+        // Preempt this case by forcing a final (non-blocking) read here.
+        for(ssize_t n = read(run->fd, buf, bufsz); n > 0; n = read(run->fd, buf, bufsz)) {
+            handleRunLog(run, std::string(buf, static_cast<size_t>(n)));
+        }
         bool completed = true;
-        activeJobs.get<0>().modify(it, [&](std::shared_ptr<Run> run){
-            close(run->fd);
+        activeJobs.byPid().modify(it, [&](std::shared_ptr<Run> run){
             run->reaped(ret);
             completed = stepRun(run);
         });
         if(completed)
             run->complete();
     }
+
     assignNewJobs();
 }
 
+void Laminar::notifyConfigChanged()
+{
+    loadConfiguration();
+    // config change may allow stuck jobs to dequeue
+    assignNewJobs();
+}
+
+void Laminar::abortAll() {
+    for(std::shared_ptr<Run> run : activeJobs) {
+        run->abort();
+    }
+}
+
 bool Laminar::nodeCanQueue(const Node& node, const Run& run) const {
     // if a node is too busy, it can't take the job
     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;
@@ -536,18 +580,42 @@ void Laminar::assignNewJobs() {
     while(it != queuedJobs.end()) {
         bool assigned = false;
         for(auto& sn : nodes) {
-            Node& node = sn.second;
+            std::shared_ptr<Node> node = sn.second;
             std::shared_ptr<Run> run = *it;
-            if(nodeCanQueue(node, *run)) {
+            if(nodeCanQueue(*node.get(), *run)) {
+                fs::path cfgDir = fs::path(homeDir)/"cfg";
+                boost::system::error_code err;
 
-                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 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, err)) {
+                        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());
+                }
+
+                uint buildNum = buildNums[run->name] + 1;
+                // create the run directory
+                fs::path rd = fs::path(homeDir)/"run"/run->name/std::to_string(buildNum);
+                bool createWorkdir = true;
+                if(fs::is_directory(rd)) {
+                    LLOG(WARNING, "Working directory already exists, removing", rd.string());
+                    fs::remove_all(rd, err);
+                    if(err) {
+                        LLOG(WARNING, "Failed to remove working directory", err.message());
+                        createWorkdir = false;
+                    }
+                }
+                if(createWorkdir && !fs::create_directory(rd, err)) {
+                    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 +626,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,15 +650,29 @@ 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());
+
+                // add job timeout if specified
+                if(fs::exists(cfgDir/"jobs"/run->name+".conf")) {
+                    int timeout = parseConfFile(fs::path(cfgDir/"jobs"/run->name+".conf").string().c_str()).get<int>("TIMEOUT", 0);
+                    if(timeout > 0) {
+                        // A raw pointer to run is used here so as not to have a circular reference.
+                        // The captured raw pointer is safe because if the Run is destroyed the Promise
+                        // will be cancelled and the callback never called.
+                        Run* r = run.get();
+                        r->timeout = srv->addTimeout(timeout, [r](){
+                            r->abort();
+                        });
+                    }
+                }
 
                 // start the job
-                node.busyExecutors++;
-                run->node = &node;
-                run->startedAt = time(0);
+                node->busyExecutors++;
+                run->node = node;
+                run->startedAt = time(nullptr);
                 run->laminarHome = homeDir;
                 run->build = buildNum;
                 // set the last known result if exists
@@ -603,7 +684,7 @@ void Laminar::assignNewJobs() {
                 // update next build number
                 buildNums[run->name] = buildNum;
 
-                LLOG(INFO, "Queued job to node", run->name, run->build, node.name);
+                LLOG(INFO, "Queued job to node", run->name, run->build, node->name);
 
                 // notify clients
                 Json j;
@@ -617,8 +698,8 @@ void Laminar::assignNewJobs() {
                  .set("reason", run->reason());
                 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<uint>([&](uint etc){
+                    j.set("etc", time(nullptr) + etc);
                 });
                 j.EndObject();
                 const char* msg = j.str();
@@ -631,6 +712,9 @@ void Laminar::assignNewJobs() {
                         c->sendMessage(msg);
                 }
 
+                // notify the rpc client if the start command was used
+                run->started.fulfiller->fulfill();
+
                 // setup run completion handler
                 run->notifyCompletion = [this](Run* r) { runFinished(r); };
 
@@ -655,23 +739,29 @@ void Laminar::assignNewJobs() {
 }
 
 void Laminar::runFinished(Run * r) {
-    Node* node = r->node;
+    std::shared_ptr<Node> node = r->node;
 
     node->busyExecutors--;
     LLOG(INFO, "Run completed", r->name, to_string(r->result));
-    time_t completedAt = time(0);
+    time_t completedAt = time(nullptr);
 
     // 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');
+        unsigned long zippedSize = zipped.size();
+        if(::compress((uint8_t*) zipped.data(), &zippedSize,
+            (const uint8_t*) r->log.data(), 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
@@ -682,7 +772,6 @@ void Laminar::runFinished(Run * r) {
             .set("number", r->build)
             .set("queued", r->startedAt - r->queuedAt)
             .set("completed", completedAt)
-            .set("duration", completedAt - r->startedAt)
             .set("started", r->startedAt)
             .set("result", to_string(r->result))
             .set("reason", r->reason());
@@ -696,16 +785,52 @@ 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);
+    // erase reference to run from activeJobs
+    activeJobs.byRunPtr().erase(r);
 
-    // will delete the job
-    activeJobs.get<2>().erase(r);
+    // remove old run directories
+    // We cannot count back the number of directories to keep from the currently
+    // finishing job because there may well be older, still-running instances of
+    // this job and we don't want to delete their rundirs. So instead, check
+    // whether there are any more active runs of this job, and if so, count back
+    // from the oldest among them. If there are none, count back from the latest
+    // known build number of this job, which may not be that of the run that
+    // finished here.
+    auto it = activeJobs.byJobName().equal_range(r->name);
+    uint oldestActive = (it.first == it.second)? buildNums[r->name] : (*it.first)->build - 1;
+    for(int i = static_cast<int>(oldestActive - numKeepRunDirs); i > 0; i--) {
+        fs::path d = fs::path(homeDir)/"run"/r->name/std::to_string(i);
+        // Once the directory does not exist, it's probably not worth checking
+        // any further. 99% of the time this loop should only ever have 1 iteration
+        // anyway so hence this (admittedly debatable) optimization.
+        if(!fs::exists(d))
+            break;
+        fs::remove_all(d);
+    }
+}
+
+// Small helper function to return the full contents of a file given its path.
+// It reads in the whole file into the given string reference.
+// This is a terrible way to serve files (especially large ones). Hopefully
+// no-one uses this function and configures their webservers appropriately.
+static bool slurp(fs::path path, std::string& output) {
+    if(!fs::is_regular_file(path))
+        return false;
+    std::ifstream fstr(path.string());
+    fstr.seekg(0, std::ios::end);
+    ssize_t sz = fstr.tellg();
+    if(fstr.good()) {
+        output.resize(static_cast<size_t>(sz));
+        fstr.seekg(0);
+        fstr.read(&output[0], sz);
+        return true;
+    }
+    return false;
 }
 
 bool Laminar::getArtefact(std::string path, std::string& result) {
@@ -713,20 +838,14 @@ bool Laminar::getArtefact(std::string path, std::string& result) {
         // we shouldn't have got here. Probably an invalid link.
         return false;
     }
-    // Reads in the whole file into the given string reference.
-    // This is a terrible way to serve files (especially large ones).
     fs::path file(fs::path(homeDir)/"archive"/path);
-    // no support for browsing archived directories
-    if(fs::is_directory(file))
-        return false;
-    std::ifstream fstr(file.string());
-    fstr.seekg(0, std::ios::end);
-    size_t sz = fstr.tellg();
-    if(fstr.rdstate() == 0) {
-        result.resize(sz);
-        fstr.seekg(0);
-        fstr.read(&result[0], sz);
-        return true;
-    }
-    return false;
+    return slurp(file, result);
+}
+
+std::string Laminar::getCustomCss()
+{
+    fs::path file(fs::path(homeDir)/"custom"/"style.css");
+    std::string result;
+    slurp(file, result);
+    return result;
 }

src/laminar.h

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-2017 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_LAMINAR_H_
-#define _LAMINAR_LAMINAR_H_
+#ifndef LAMINAR_LAMINAR_H_
+#define LAMINAR_LAMINAR_H_
 
 #include "interface.h"
 #include "run.h"
@@ -27,7 +27,7 @@
 #include <unordered_map>
 
 // Node name to node object map
-typedef std::unordered_map<std::string,Node> NodeMap;
+typedef std::unordered_map<std::string, std::shared_ptr<Node>> NodeMap;
 
 struct Server;
 class Json;
@@ -36,10 +36,10 @@ 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();
+    ~Laminar() override;
 
     // Runs the application forever
     void run();
@@ -48,44 +48,36 @@ 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 setParam(std::string job, uint buildNum, std::string param, std::string value) override;
     bool getArtefact(std::string path, std::string& result) override;
+    std::string getCustomCss() override;
+    void abortAll() override;
+    void reapChildren() override;
+    void notifyConfigChanged() override;
 
 private:
     bool loadConfiguration();
-    void reapAdvance();
     void assignNewJobs();
     bool stepRun(std::shared_ptr<Run> run);
+    void handleRunLog(std::shared_ptr<Run> run, std::string log);
     void runFinished(Run*);
     bool nodeCanQueue(const Node&, const Run&) const;
     // expects that Json has started an array
-    void populateArtifacts(Json& out, std::string job, int num) const;
+    void populateArtifacts(Json& out, std::string job, uint num) const;
 
-    Run* activeRun(std::string name, int num) {
-        auto it = activeJobs.get<1>().find(boost::make_tuple(name, num));
-        return it == activeJobs.get<1>().end() ? nullptr : it->get();
+    Run* activeRun(std::string name, uint num) {
+        auto it = activeJobs.byRun().find(boost::make_tuple(name, num));
+        return it == activeJobs.byRun().end() ? nullptr : it->get();
     }
 
     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,8 +88,9 @@ private:
     NodeMap nodes;
     std::string homeDir;
     std::set<LaminarClient*> clients;
-    bool eraseWorkdir;
+    std::set<LaminarWaiter*> waiters;
+    uint numKeepRunDirs;
     std::string archiveUrl;
 };
 
-#endif // _LAMINAR_LAMINAR_H_
+#endif // LAMINAR_LAMINAR_H_

src/log.h

@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_LOG_H_
-#define _LAMINAR_LOG_H_
+#ifndef LAMINAR_LOG_H_
+#define LAMINAR_LOG_H_
 
 #include <kj/debug.h>
 
@@ -33,5 +33,5 @@
                         #__VA_ARGS__, __VA_ARGS__)
 
 
-#endif // _LAMINAR_LOG_H_
+#endif // LAMINAR_LOG_H_
 

src/main.cpp

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-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;
 }
-

src/node.h

@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_NODE_H_
-#define _LAMINAR_NODE_H_
+#ifndef LAMINAR_NODE_H_
+#define LAMINAR_NODE_H_
 
 #include <string>
 #include <set>
@@ -40,4 +40,4 @@ public:
 };
 
 
-#endif // _LAMINAR_NODE_H_
+#endif // LAMINAR_NODE_H_

src/resources.cpp

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-2017 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -19,40 +19,39 @@
 #include "resources.h"
 #include <string.h>
 
-#define INIT_RESOURCE(route, name) \
+#define INIT_RESOURCE(route, name, content_type) \
     extern const char _binary_##name##_z_start[];\
     extern const char _binary_##name##_z_end[]; \
-    resources[route] = std::make_pair(_binary_ ## name ## _z_start, _binary_ ## name ## _z_end)
+    resources.emplace(route, Resource{_binary_ ## name ## _z_start, _binary_ ## name ## _z_end, content_type})
+
+#define CONTENT_TYPE_HTML "text/html; charset=utf-8"
+#define CONTENT_TYPE_ICO  "image/x-icon"
+#define CONTENT_TYPE_PNG  "image/png"
+#define CONTENT_TYPE_JS   "application/javascript; charset=utf-8"
+#define CONTENT_TYPE_CSS  "text/css; charset=utf-8"
 
 Resources::Resources()
 {
-    // TODO: Content-type
-    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("/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/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);
-    INIT_RESOURCE("/css/bootstrap.min.css", css_bootstrap_min_css);
+    INIT_RESOURCE("/", index_html, CONTENT_TYPE_HTML);
+    INIT_RESOURCE("/favicon.ico", favicon_ico, CONTENT_TYPE_ICO);
+    INIT_RESOURCE("/favicon-152.png", favicon_152_png, CONTENT_TYPE_PNG);
+    INIT_RESOURCE("/icon.png", icon_png, CONTENT_TYPE_PNG);
+    INIT_RESOURCE("/js/app.js", js_app_js, CONTENT_TYPE_JS);
+    INIT_RESOURCE("/js/Chart.HorizontalBar.js", js_Chart_HorizontalBar_js, CONTENT_TYPE_JS);
+    INIT_RESOURCE("/js/ansi_up.js", js_ansi_up_js, CONTENT_TYPE_JS);
+    INIT_RESOURCE("/js/vue.min.js", js_vue_min_js, CONTENT_TYPE_JS);
+    INIT_RESOURCE("/js/vue-router.min.js", js_vue_router_min_js, CONTENT_TYPE_JS);
+    INIT_RESOURCE("/js/ansi_up.js", js_ansi_up_js, CONTENT_TYPE_JS);
+    INIT_RESOURCE("/js/Chart.min.js", js_Chart_min_js, CONTENT_TYPE_JS);
+    INIT_RESOURCE("/js/Chart.HorizontalBar.js", js_Chart_HorizontalBar_js, CONTENT_TYPE_JS);
+    INIT_RESOURCE("/css/bootstrap.min.css", css_bootstrap_min_css, CONTENT_TYPE_CSS);
 }
 
 inline bool beginsWith(std::string haystack, const char* needle) {
     return strncmp(haystack.c_str(), needle, strlen(needle)) == 0;
 }
 
-bool Resources::handleRequest(std::string path, const char **start, const char **end) {
+bool Resources::handleRequest(std::string path, const char** start, const char** end, const char** content_type) {
     // need to keep the list of "application links" synchronised with the angular
     // application. We cannot return a 404 for any of these
     auto it = beginsWith(path,"/jobs")
@@ -60,8 +59,9 @@ bool Resources::handleRequest(std::string path, const char **start, const char *
             : resources.find(path);
 
     if(it != resources.end()) {
-        *start = it->second.first;
-        *end = it->second.second;
+        *start = it->second.start;
+        *end = it->second.end;
+        *content_type = it->second.content_type;
         return true;
     }
 

src/resources.h

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-2017 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_RESOURCES_H_
-#define _LAMINAR_RESOURCES_H_
+#ifndef LAMINAR_RESOURCES_H_
+#define LAMINAR_RESOURCES_H_
 
 #include <unordered_map>
 #include <utility>
@@ -30,12 +30,17 @@ public:
     Resources();
 
     // If a resource is known for the given path, set start and end to the
-    // binary data to send to the client. Function returns false if no resource
-    // for the given path is known (404)
-    bool handleRequest(std::string path, const char** start, const char** end);
+    // binary data to send to the client, and content_type to its MIME
+    // type. Function returns false if no resource for the given path exists
+    bool handleRequest(std::string path, const char** start, const char** end, const char** content_type);
 
 private:
-    std::unordered_map<std::string, std::pair<const char*, const char*>> resources;
+    struct Resource {
+        const char* start;
+        const char* end;
+        const char* content_type;
+    };
+    std::unordered_map<std::string, const Resource> resources;
 };
 
-#endif // _LAMINAR_RESOURCES_H_
+#endif // LAMINAR_RESOURCES_H_

src/resources/index.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html ng-app="laminar">
+<html>
 <head>
  <base href="/">
  <meta charset="utf-8">
@@ -8,23 +8,26 @@
  <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>
+ <link href="/custom/style.css" rel="stylesheet">
+ <script src="/js/app.js" defer></script>
  <style>
   body, html { height: 100%; }
-  .navbar { margin-bottom: 0; }
+  .navbar { margin-bottom: 0; border-radius: 0; }
   .navbar-brand { margin: 0 -15px; padding: 7px 15px }
   .navbar-brand>img { display: inline; }
   a.navbar-btn { color: #9d9d9d; }
   a.navbar-btn.active { color: #fff; }
   a.navbar-btn:hover { color: #fff; text-decoration: none; }
   a.navbar-btn:focus { color: #fff; }
+  .bell { margin: 8px 15px; color: #9d9d9d; }
+  .bell:hover { text-decoration: none; color: #9d9d9d; cursor: pointer; }
+  .bell.active { color: #333; }
   dt,dd { line-height: 2; }
   canvas {
    width: 100% !important;
@@ -36,42 +39,214 @@
    margin-top: 5px;
    margin-bottom: 0;
   }
-  .spin {
-	  -webkit-animation: rotation 2s infinite linear;
+  table#joblist tr:first-child td { border-top: 0; }
+  #popup-connecting {
+    position: fixed;
+    background: white;
+    border: 1px solid #ddd;
+    bottom: 10px;
+    right: 10px;
+    padding: 20px;
   }
-  @-webkit-keyframes rotation {
-    from {-webkit-transform: rotate(0deg);}
-    to   {-webkit-transform: rotate(359deg);}
+  span.status {
+    display: inline-block;
+    width: 1em;
+    text-align: center;
+    font-family: sans-serif;
   }
-  img.spin.small {
-	  width: 11px;
-	  height: 11px;
+  span.success { color: forestgreen; }
+  span.failed { color: firebrick; }
+  span.aborted { color: indigo; }
+  span.spin {
+    color: steelblue;
+    animation: 2s linear infinite spin;
+  }
+  @keyframes spin {
+    to { transform: rotate(360deg); }
   }
-  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); } }
-
  </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><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>
+       <small class="pull-right">{{formatDuration(job.started, job.completed)}}</small>
+       <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 {{formatDuration(job.started, job.completed)}} 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>
+      <td class="text-center">{{formatDuration(job.started,job.completed)}}</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><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">{{formatDuration(job.started, job.completed)}}</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">{{formatDuration(job.started, job.completed)}}</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"><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>Duration</dt><dd>{{formatDuration(job.started, job.completed)}}</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"><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" :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>
+    <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>
+  </nav>
+  <a v-on:click="toggleNotifications(!notify)" v-show="supportsNotifications" class="bell pull-right" :class="{'active':notify}" :title="(notify?'Disable':'Enable')+' notifications'">&#128276;</a>
+  <router-view></router-view>
+  <div v-show="!connected" id="popup-connecting"><span class="status spin">⚙&#xfe0e;</span>&nbsp;Connecting...</div>
+ </div>
 </body>
 </html>
 

src/resources/js/app.js

@@ -1,340 +1,564 @@
-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 wsp = function(path) {
+  return new WebSocket((location.protocol === 'https:'?'wss://':'ws://')
+                          + location.host + path);
+}
+const WebsocketHandler = function() {
+  function setupWebsocket(path, next) {
+    var ws = wsp(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;
+          // Calculate clock offset (used by ProgressUpdater)
+          comp.$root.clockSkew = msg.time - Math.floor((new Date()).getTime()/1000);
+          comp.$root.connected = true;
+          // 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 {
+          this.comp.$root.showNotify(msg.type, msg.data);
+          if(typeof this.comp[msg.type] === 'function')
+            this.comp[msg.type](msg.data);
+        }
+      }
+    };
+    ws.onclose = function(ev) {
+      // if this.comp isn't set, this connection has never been used
+      // and a re-connection isn't meaningful
+      if(!ev.wasClean && 'comp' in this) {
+        this.comp.$root.connected = false;
+        this.reconnectTimeout = setTimeout(()=>{
+          var newWs = setupWebsocket(path, (fn) => { fn(this.comp); });
+          // pass on the current component for the cases where the
+          // connection fails (onclose is called again) before the
+          // status message can reassign the current component
+          newWs.comp = this.comp;
+        }, 2000);
+      }
+    }
+    return ws;
+  };
+  return {
+    beforeRouteEnter(to, from, next) {
+      setupWebsocket(to.path, (fn) => { next(fn); });
+    },
+    beforeRouteUpdate(to, from, next) {
+      this.ws.close();
+      clearTimeout(this.ws.reconnectTimeout);
+      setupWebsocket(to.path, (fn) => { fn(this); next(); });
+    },
+    beforeRouteLeave(to, from, next) {
+      this.ws.close();
+      clearTimeout(this.ws.reconnectTimeout);
+      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) {
+      var marker = '⚙';
+      var classname = result;
+      if (result === 'success')
+         marker = '✔';
+      else if (result === 'failed' || result === 'aborted')
+         marker = '✘';
+      else
+         classname = 'spin';
+      return '<span title="' + result + '" class="status ' + classname + '">' + marker + '&#xfe0e;</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();
+    },
+    formatDuration: function(start, end) {
+      if(!end)
+        end = Math.floor(Date.now()/1000) + this.$root.clockSkew;
+      if(end - start > 3600)
+        return Math.floor((end-start)/3600) + ' hours, ' + Math.floor(((end-start)%3600)/60) + ' minutes';
+      else if(end - start > 60)
+        return Math.floor((end-start)/60) + ' minutes, ' + ((end-start)%60) + ' seconds';
+      else
+        return (end-start) + ' seconds';
+    }
+  }
+};
 
-			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 = (Math.floor(Date.now()/1000) + this.$root.clockSkew - 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 - msg.executorsBusy,
+              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: "rgba(143,188,143,0.65)", //darkseagreen at 0.65
+            strokeColor: "forestgreen",
+            data: msg.buildsPerDay.map(function(e) {
+              return e.success || 0;
+            })
+          }, {
+            label: "Failed Bulids",
+            fillColor: "rgba(233,150,122,0.65)", //darksalmon at 0.65
+            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, ProgressUpdater],
+    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;
+        state.jobsRunning = msg.running;
+        // mix running and completed jobs
+        for (var i in msg.running) {
+          var idx = state.jobs.findIndex(job => job.name === msg.running[i].name);
+          if (idx > -1)
+            state.jobs[idx] = msg.running[i];
+          else {
+            // special case: first run of a job.
+            state.jobs.unshift(msg.running[i]);
+            state.jobs.sort(function(a, b){return a.name < b.name ? -1 : a.name > b.name ? 1 : 0;});
+          }
+        }
+        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_started: function(data) {
+        var updAt = null;
+        for (var i in state.jobsRunning) {
+          if (state.jobsRunning[i].name === data.name) {
+            updAt = i;
+            break;
+          }
+        }
+        if (updAt === null) {
+          state.jobsRunning.unshift(data);
+        } else {
+          state.jobsRunning[updAt] = data;
+        }
+        updAt = null;
+        for (var i in state.jobs) {
+          if (state.jobs[i].name === data.name) {
+            updAt = i;
+            break;
+          }
+        }
+        if (updAt === null) {
+          // first execution of new job. TODO insert without resort
+          state.jobs.unshift(data);
+          state.jobs.sort(function(a, b){return a.name < b.name ? -1 : a.name > b.name ? 1 : 0;});
+        } else {
+          state.jobs[updAt] = data;
+        }
+        this.$forceUpdate();
+      },
+      job_completed: function(data) {
+        for (var i in state.jobs) {
+          if (state.jobs[i].name === data.name) {
+            state.jobs[i] = data;
+            // forceUpdate in second loop
+            break;
+          }
+        }
+        for (var i in state.jobsRunning) {
+          if (state.jobsRunning[i].name === data.name) {
+            state.jobsRunning.splice(i, 1);
+            this.$forceUpdate();
+            break;
+          }
+        }
+      }
+    }
+  };
+}();
+
+var Job = function() {
+  var state = {
+    jobsRunning: [],
+    jobsRecent: [],
+    lastSuccess: null,
+    lastFailed: null,
+    nQueued: 0,
+  };
+  return Vue.extend({
+    template: '#job',
+    mixins: [WebsocketHandler, Utils, ProgressUpdater],
+    data: function() {
+      return state;
+    },
+    methods: {
+      status: function(msg) {
+        state.jobsRunning = msg.running;
+        state.jobsRecent = msg.recent;
+        state.lastSuccess = msg.lastSuccess;
+        state.lastFailed = msg.lastFailed;
+        state.nQueued = msg.nQueued;
+
+        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.completed - e.started;
+            }).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 += ansi_up.ansi_to_html(d.replace(/</g,'&lt;').replace(/>/g,'&gt;'));
+    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.job = data;
+        state.latestNum = data.latestNum;
+        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 => {
+        state.log = '';
+        vm.logws = wsp(to.path + '/log');
+        vm.logws.onmessage = function(msg) {
+          logHandler(vm, msg.data);
+        }
+      });
+    },
+    beforeRouteUpdate(to, from, next) {
+      var vm = this;
+      vm.logws.close();
+      state.log = '';
+      vm.logws = wsp(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
+    clockSkew: 0,
+    connected: false,
+    notify: 'localStorage' in window && localStorage.getItem('showNotifications') == 1
+  },
+  computed: {
+    supportsNotifications() {
+      return 'Notification' in window && Notification.permission !== 'denied';
+    }
+  },
+  methods: {
+    toggleNotifications(en) {
+      if(Notification.permission !== 'granted')
+        Notification.requestPermission(p => this.notify = (p === 'granted'))
+      else
+        this.notify = en;
+    },
+    showNotify(msg, data) {
+      if(this.notify && msg === 'job_completed')
+        new Notification('Job ' + data.result, {
+          body: data.name + ' ' + '#' + data.number + ': ' + data.result
+        });
+    }
+  },
+  watch: {
+    notify(e) { localStorage.setItem('showNotifications', e ? 1 : 0); }
+  },
+  router: new VueRouter({
+    mode: 'history',
+    routes: [
+      { path: '/',                   component: Home },
+      { path: '/jobs',               component: Jobs },
+      { path: '/jobs/:name',         component: Job },
+      { path: '/jobs/:name/:number', component: Run }
+    ],
+  }),
 });

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>

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>
-

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>
-

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>

src/run.cpp

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-2017 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;
@@ -34,7 +35,6 @@ std::string to_string(const RunState& rs) {
     case RunState::ABORTED: return "aborted";
     case RunState::FAILED: return "failed";
     case RunState::SUCCESS: return "success";
-    case RunState::UNKNOWN:
     default:
          return "unknown";
     }
@@ -58,9 +58,6 @@ std::string Run::reason() const {
 }
 
 bool Run::step() {
-    if(!currentScript.empty() && procStatus != 0)
-        result = RunState::FAILED;
-
     if(scripts.size()) {
         currentScript = scripts.front();
         scripts.pop();
@@ -68,7 +65,16 @@ 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, nullptr);
+
+            // set pgid == pid for easy killing on abort
+            setpgid(0, 0);
+
             close(pfd[0]);
             dup2(pfd[1], 1);
             dup2(pfd[1], 2);
@@ -80,35 +86,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,14 +127,31 @@ 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);
 }
+
+void Run::abort() {
+    // clear all pending scripts
+    std::queue<Script>().swap(scripts);
+    kill(-pid, SIGTERM);
+}
+
 void Run::reaped(int status) {
-    procStatus = status;
+    // once state is non-success it cannot change again
+    if(result != RunState::SUCCESS)
+        return;
+
+    if(WIFSIGNALED(status) && (WTERMSIG(status) == SIGTERM || WTERMSIG(status) == SIGKILL))
+        result = RunState::ABORTED;
+    else if(status != 0)
+        result = RunState::FAILED;
+    // otherwise preserve earlier status
 }
 
 void Run::complete() {

src/run.h

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-2017 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_RUN_H_
-#define _LAMINAR_RUN_H_
+#ifndef LAMINAR_RUN_H_
+#define LAMINAR_RUN_H_
 
 #include <string>
 #include <queue>
@@ -25,6 +25,8 @@
 #include <functional>
 #include <ostream>
 #include <unordered_map>
+#include <memory>
+#include <kj/async.h>
 
 enum class RunState {
     UNKNOWN,
@@ -57,11 +59,17 @@ 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);
 
+    // aborts this run
+    void abort();
+
     // called when a process owned by this run has been reaped. The status
     // may be used to set the run's job status
     void reaped(int status);
@@ -69,27 +77,34 @@ public:
     std::string reason() const;
 
     std::function<void(Run*)> notifyCompletion;
-    Node* node;
+    std::shared_ptr<Node> node;
     RunState result;
     RunState lastResult;
     std::string laminarHome;
     std::string name;
-    std::string wd;
+    std::string runDir;
     std::string parentName;
     int parentBuild = 0;
     std::string reasonMsg;
-    int build = 0;
+    uint build = 0;
     std::string log;
     pid_t pid;
     int fd;
-    int procStatus;
     std::unordered_map<std::string, std::string> params;
+    kj::Promise<void> timeout = kj::NEVER_DONE;
+    kj::PromiseFulfillerPair<void> started = kj::newPromiseAndFulfiller<void>();
 
     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;
 };
 
@@ -123,7 +138,7 @@ struct _run_index : bmi::indexed_by<
             std::shared_ptr<Run>,
         // a combination of their job name and build number
             bmi::member<Run, std::string, &Run::name>,
-            bmi::member<Run, int, &Run::build>
+            bmi::member<Run, uint, &Run::build>
         >>,
         // or a pointer to a Run object.
         bmi::hashed_unique<_run_same>,
@@ -138,7 +153,20 @@ struct RunSet: public boost::multi_index_container<
     std::shared_ptr<Run>,
     _run_index
 > {
-    // TODO: getters for each index
+    typename bmi::nth_index<RunSet, 0>::type& byPid() { return get<0>(); }
+    typename bmi::nth_index<RunSet, 0>::type const& byPid() const { return get<0>(); }
+
+    typename bmi::nth_index<RunSet, 1>::type& byRun() { return get<1>(); }
+    typename bmi::nth_index<RunSet, 1>::type const& byRun() const { return get<1>(); }
+
+    typename bmi::nth_index<RunSet, 2>::type& byRunPtr() { return get<2>(); }
+    typename bmi::nth_index<RunSet, 2>::type const& byRunPtr() const { return get<2>(); }
+
+    typename bmi::nth_index<RunSet, 3>::type& byStartedAt() { return get<3>(); }
+    typename bmi::nth_index<RunSet, 3>::type const& byStartedAt() const { return get<3>(); }
+
+    typename bmi::nth_index<RunSet, 4>::type& byJobName() { return get<4>(); }
+    typename bmi::nth_index<RunSet, 4>::type const& byJobName() const { return get<4>(); }
 };
 
-#endif // _LAMINAR_RUN_H_
+#endif // LAMINAR_RUN_H_

src/server.cpp

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-2018 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -32,6 +32,13 @@
 #include <websocketpp/server.hpp>
 
 #include <sys/eventfd.h>
+#include <sys/inotify.h>
+#include <sys/signal.h>
+#include <sys/signalfd.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 {
@@ -70,18 +77,23 @@ 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);
     }
 
-    // Start a job, without waiting for it to finish
-    kj::Promise<void> trigger(TriggerContext context) override {
+    ~RpcImpl() override {
+        laminar.deregisterWaiter(this);
+    }
+
+    // Queue a job, without waiting for it to start
+    kj::Promise<void> queue(QueueContext context) override {
         std::string jobName = context.getParams().getJobName();
-        LLOG(INFO, "RPC trigger", jobName);
+        LLOG(INFO, "RPC queue", jobName);
         ParamMap params;
         for(auto p : context.getParams().getParams()) {
             params[p.getName().cStr()] = p.getValue().cStr();
@@ -93,7 +105,7 @@ public:
         return kj::READY_NOW;
     }
 
-    // Start a job and wait for the result
+    // Start a job, without waiting for it to finish
     kj::Promise<void> start(StartContext context) override {
         std::string jobName = context.getParams().getJobName();
         LLOG(INFO, "RPC start", jobName);
@@ -102,9 +114,31 @@ 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(Run* r = run.get()) {
+            return r->started.promise.then([context,r]() mutable {
+                context.getResults().setResult(LaminarCi::MethodResult::SUCCESS);
+                context.getResults().setBuildNum(r->build);
+            });
+        } else {
+            context.getResults().setResult(LaminarCi::MethodResult::FAILED);
+            return kj::READY_NOW;
+        }
+    }
+
+    // Start a job and wait for the result
+    kj::Promise<void> run(RunContext context) override {
+        std::string jobName = context.getParams().getJobName();
+        LLOG(INFO, "RPC run", jobName);
+        ParamMap params;
+        for(auto p : context.getParams().getParams()) {
+            params[p.getName().cStr()] = p.getValue().cStr();
+        }
+        std::shared_ptr<Run> run = laminar.queueJob(jobName, params);
+        if(const Run* r = run.get()) {
+            runWaiters[r].emplace_back(kj::newPromiseAndFulfiller<RunState>());
+            return runWaiters[r].back().promise.then([context,run](RunState state) mutable {
                 context.getResults().setResult(fromRunState(state));
+                context.getResults().setBuildNum(run->build);
             });
         } else {
             context.getResults().setResult(LaminarCi::JobResult::UNKNOWN);
@@ -112,23 +146,10 @@ 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();
-        int buildNum = context.getParams().getBuildNum();
+        uint buildNum = context.getParams().getBuildNum();
         LLOG(INFO, "RPC set", jobName, buildNum);
 
         LaminarCi::MethodResult result = laminar.setParam(jobName, buildNum,
@@ -139,9 +160,42 @@ 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;
 };
 
 
@@ -168,7 +222,7 @@ public:
         // Handle plain HTTP requests by delivering the binary resource
         wss.set_http_handler([this](websocketpp::connection_hdl hdl){
             websocket::connection_ptr c = wss.get_con_from_hdl(hdl);
-            const char* start, *end;
+            const char* start, *end, *content_type;
             std::string resource = c->get_resource();
             if(resource.compare(0, strlen("/archive/"), "/archive/") == 0) {
                 std::string file(resource.substr(strlen("/archive/")));
@@ -180,8 +234,14 @@ public:
                 } else {
                     c->set_status(websocketpp::http::status_code::not_found);
                 }
-            } else if(resources.handleRequest(resource, &start, &end)) {
+            } else if(resource.compare("/custom/style.css") == 0) {
                 c->set_status(websocketpp::http::status_code::ok);
+                c->append_header("Content-Type", "text/css; charset=utf-8");
+                c->append_header("Content-Transfer-Encoding", "binary");
+                c->set_body(laminar.getCustomCss());
+            } else if(resources.handleRequest(resource, &start, &end, &content_type)) {
+                c->set_status(websocketpp::http::status_code::ok);
+                c->append_header("Content-Type", content_type);
                 c->append_header("Content-Encoding", "gzip");
                 c->append_header("Content-Transfer-Encoding", "binary");
                 std::string response(start,end);
@@ -190,7 +250,6 @@ public:
                 // 404
                 c->set_status(websocketpp::http::status_code::not_found);
             }
-            c->lc->close(false);
         });
 
         // Handle new websocket connection. Parse the URL to determine
@@ -204,17 +263,17 @@ public:
                     c->lc->scope.type = MonitorScope::ALL;
                 } else {
                     res = res.substr(5);
-                    int split = res.find('/',1);
+                    size_t split = res.find('/',1);
                     std::string job = res.substr(1,split-1);
                     if(!job.empty()) {
                         c->lc->scope.job = job;
                         c->lc->scope.type = MonitorScope::JOB;
                     }
                     if(split != std::string::npos) {
-                        int split2 = res.find('/', split+1);
+                        size_t split2 = res.find('/', split+1);
                         std::string run = res.substr(split+1, split2-split);
                         if(!run.empty()) {
-                            c->lc->scope.num = atoi(run.c_str());
+                            c->lc->scope.num = static_cast<uint>(atoi(run.c_str()));
                             c->lc->scope.type = MonitorScope::RUN;
                         }
                         if(split2 != std::string::npos && res.compare(split2, 4, "/log") == 0) {
@@ -223,15 +282,13 @@ public:
                     }
                 }
             }
+            // registerClient can happen after a successful websocket handshake.
+            // However, the connection might not be closed gracefully, so the
+            // corresponding deregister operation happens in the connection
+            // destructor rather than the close handler
             laminar.registerClient(c->lc);
             laminar.sendStatus(c->lc);
         });
-
-        wss.set_close_handler([this](websocketpp::connection_hdl hdl){
-            websocket::connection_ptr c = wss.get_con_from_hdl(hdl);
-            laminar.deregisterClient(c->lc);
-            c->lc->close();
-        });
     }
 
     // Return a new connection object linked with the context defined below.
@@ -243,6 +300,12 @@ public:
         return c;
     }
 
+    void connectionDestroyed(LaminarClient* lc) {
+        // This will be called for all connections, not just websockets, so
+        // the laminar instance should silently ignore unknown clients
+        laminar.deregisterClient(lc);
+    }
+
 private:
     Resources resources;
     LaminarInterface& laminar;
@@ -265,31 +328,35 @@ struct RpcConnection {
 };
 
 // Context for a WebsocketConnection (implements LaminarClient)
-// This object is a streambuf and reimplements xsputn so that it can follow any
-// write the websocketpp library makes to it with a write to the appropriate
-// descriptor in the kj-async context.
-struct Server::WebsocketConnection : public LaminarClient, public std::streambuf {
+// This object maps read and write handlers between the websocketpp library
+// and the corresponding kj async methods
+struct Server::WebsocketConnection : public LaminarClient {
     WebsocketConnection(kj::Own<kj::AsyncIoStream>&& stream, Server::HttpImpl& http) :
+        http(http),
         stream(kj::mv(stream)),
-        out(this),
         cn(http.newConnection(this)),
-        writePaf(kj::newPromiseAndFulfiller<void>()),
-        closeOnComplete(false)
+        writePaf(kj::newPromiseAndFulfiller<void>())
     {
-        cn->register_ostream(&out);
+        cn->set_write_handler([this](websocketpp::connection_hdl, const char* s, size_t sz) {
+            outputBuffer.append(std::string(s, sz));
+            writePaf.fulfiller->fulfill();
+            return std::error_code();
+        });
         cn->start();
     }
 
-    ~WebsocketConnection() noexcept(true) {
-        outputBuffer.clear();
-        writePaf.fulfiller->fulfill();
+    virtual ~WebsocketConnection() noexcept(true) override {
+        // Removes the connection from the list of registered clients. Must be
+        // here rather than in the websocket closing handshake because connections
+        // might be unexpectedly/aggressively closed and any references must be
+        // removed.
+        http.connectionDestroyed(this);
     }
 
     kj::Promise<void> pend() {
         return stream->tryRead(ibuf, 1, sizeof(ibuf)).then([this](size_t sz){
-            cn->read_all(ibuf, sz);
+            cn->read_some(ibuf, sz);
             if(sz == 0 || cn->get_state() == websocketpp::session::state::closed) {
-                cn->eof();
                 return kj::Promise<void>(kj::READY_NOW);
             }
             return pend();
@@ -303,14 +370,13 @@ struct Server::WebsocketConnection : public LaminarClient, public std::streambuf
             // to send now
             payload.swap(outputBuffer);
             writePaf = kj::newPromiseAndFulfiller<void>();
-            if(payload.empty()) {
-                stream->shutdownWrite();
-                return kj::Promise<void>(kj::READY_NOW);
-            } else {
-                return stream->write(payload.data(), payload.size()).then([this](){
-                    return closeOnComplete ? stream->shutdownWrite(), kj::Promise<void>(kj::READY_NOW) : writeTask();
-                }).attach(kj::mv(payload));
-            }
+            KJ_ASSERT(!payload.empty());
+            return stream->write(payload.data(), payload.size()).then([this](){
+                if(cn->get_state() == websocketpp::session::state::closed) {
+                    return kj::Promise<void>(kj::READY_NOW);
+                }
+                return writeTask();
+            }).attach(kj::mv(payload));
         });
     }
 
@@ -318,113 +384,157 @@ struct Server::WebsocketConnection : public LaminarClient, public std::streambuf
         cn->send(payload, websocketpp::frame::opcode::text);
     }
 
-    void close(bool now) override {
-        closeOnComplete = true;
-        if(now) {
-            outputBuffer.clear();
-            writePaf.fulfiller->fulfill();
-        }
-    }
-
-    std::streamsize xsputn(const char* s, std::streamsize sz) override {
-        outputBuffer.append(std::string(s, sz));
-        writePaf.fulfiller->fulfill();
-        return sz;
-    }
-
+    HttpImpl& http;
     kj::Own<kj::AsyncIoStream> stream;
-    std::ostream out;
     websocket::connection_ptr cn;
     std::string outputBuffer;
     kj::PromiseFulfillerPair<void> writePaf;
     char ibuf[131072];
-    bool closeOnComplete;
 };
 
 Server::Server(LaminarInterface& li, kj::StringPtr rpcBindAddress,
                kj::StringPtr httpBindAddress) :
     rpcInterface(kj::heap<RpcImpl>(li)),
-    httpInterface(new HttpImpl(li)),
+    laminarInterface(li),
+    httpInterface(kj::heap<HttpImpl>(li)),
     ioContext(kj::setupAsyncIo()),
-    tasks(*this)
+    listeners(kj::heap<kj::TaskSet>(*this)),
+    childTasks(*this),
+    httpConnections(*this),
+    httpReady(kj::newPromiseAndFulfiller<void>())
 {
     // RPC task
-    tasks.add(ioContext.provider->getNetwork().parseAddress(rpcBindAddress, 0)
+    if(rpcBindAddress.startsWith("unix:"))
+        unlink(rpcBindAddress.slice(strlen("unix:")).cStr());
+    listeners->add(ioContext.provider->getNetwork().parseAddress(rpcBindAddress)
               .then([this](kj::Own<kj::NetworkAddress>&& addr) {
-        acceptRpcClient(addr->listen());
+        return acceptRpcClient(addr->listen());
     }));
 
     // HTTP task
-    tasks.add(ioContext.provider->getNetwork().parseAddress(httpBindAddress, 0)
+    if(httpBindAddress.startsWith("unix:"))
+        unlink(httpBindAddress.slice(strlen("unix:")).cStr());
+    listeners->add(ioContext.provider->getNetwork().parseAddress(httpBindAddress)
               .then([this](kj::Own<kj::NetworkAddress>&& addr) {
-        acceptHttpClient(addr->listen());
+        // TODO: a better way? Currently used only for testing
+        httpReady.fulfiller->fulfill();
+        return acceptHttpClient(addr->listen());
     }));
+
+    // handle SIGCHLD
+    {
+        sigset_t mask;
+        sigemptyset(&mask);
+        sigaddset(&mask, SIGCHLD);
+        sigprocmask(SIG_BLOCK, &mask, nullptr);
+        int sigchld = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC);
+        auto event = ioContext.lowLevelProvider->wrapInputFd(sigchld, kj::LowLevelAsyncIoProvider::TAKE_OWNERSHIP);
+        auto buffer = kj::heapArrayBuilder<char>(PROC_IO_BUFSIZE);
+        reapWatch = handleFdRead(event, buffer.asPtr().begin(), [this](const char* buf, size_t){
+            const struct signalfd_siginfo* siginfo = reinterpret_cast<const struct signalfd_siginfo*>(buf);
+            KJ_ASSERT(siginfo->ssi_signo == SIGCHLD);
+            laminarInterface.reapChildren();
+        }).attach(std::move(event)).attach(std::move(buffer));
+    }
+
+    // handle watched paths
+    {
+        inotify_fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
+        auto event = ioContext.lowLevelProvider->wrapInputFd(inotify_fd, kj::LowLevelAsyncIoProvider::TAKE_OWNERSHIP);
+        auto buffer = kj::heapArrayBuilder<char>(PROC_IO_BUFSIZE);
+        pathWatch = handleFdRead(event, buffer.asPtr().begin(), [this](const char*, size_t){
+            laminarInterface.notifyConfigChanged();
+        }).attach(std::move(event)).attach(std::move(buffer));
+    }
 }
 
 Server::~Server() {
-    // RpcImpl is deleted through Capability::Client.
-    // Deal with the HTTP interface the old-fashioned way
-    delete httpInterface;
 }
 
 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);
-    kj::Promise<void> quit = kj::evalLater([this](){
+    // The eventfd is used to quit the server later since we need to trigger
+    // a reaction from the event loop
+    efd_quit = eventfd(0, EFD_CLOEXEC|EFD_NONBLOCK);
+    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);
+    }).wait(ioContext.waitScope);
+    // Execution arrives here when the eventfd is triggered (in stop())
+
+    // Shutdown sequence:
+    // 1. stop accepting new connections
+    listeners = nullptr;
+    // 2. abort current jobs. Most of the time this isn't necessary since
+    // systemd stop or other kill mechanism will send SIGTERM to the whole
+    // process group.
+    laminarInterface.abortAll();
+    // 3. wait for all children to close
+    childTasks.onEmpty().wait(ioContext.waitScope);
+    // 4. run the loop once more to send any pending output to websocket clients
+    ioContext.waitScope.poll();
+    // 5. return: websockets will be destructed
 }
 
 void Server::stop() {
-    eventfd_write(efd, 1);
+    // This method is expected to be called in signal context, so an eventfd
+    // is used to get the main loop to react. See run()
+    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(const char*,size_t)> cb) {
+    auto event = this->ioContext.lowLevelProvider->wrapInputFd(fd, kj::LowLevelAsyncIoProvider::TAKE_OWNERSHIP);
+    auto buffer = kj::heapArrayBuilder<char>(PROC_IO_BUFSIZE);
+    childTasks.add(handleFdRead(event, buffer.asPtr().begin(), cb).attach(std::move(event)).attach(std::move(buffer)));
 }
 
-void Server::acceptHttpClient(kj::Own<kj::ConnectionReceiver>&& listener) {
-    auto ptr = listener.get();
-    tasks.add(ptr->accept().then(kj::mvCapture(kj::mv(listener),
-        [this](kj::Own<kj::ConnectionReceiver>&& listener,
-                            kj::Own<kj::AsyncIoStream>&& connection) {
-            acceptHttpClient(kj::mv(listener));
+kj::Promise<void> Server::addTimeout(int seconds, std::function<void ()> cb) {
+    return ioContext.lowLevelProvider->getTimer().afterDelay(seconds * kj::SECONDS).then([cb](){
+        cb();
+    }).eagerlyEvaluate(nullptr);
+}
+
+void Server::addWatchPath(const char* dpath) {
+    inotify_add_watch(inotify_fd, dpath, IN_ONLYDIR | IN_CLOSE_WRITE | IN_CREATE | IN_DELETE);
+}
+
+kj::Promise<void> Server::acceptHttpClient(kj::Own<kj::ConnectionReceiver>&& listener) {
+    kj::ConnectionReceiver& cr = *listener.get();
+    return cr.accept().then(kj::mvCapture(kj::mv(listener),
+        [this](kj::Own<kj::ConnectionReceiver>&& listener, kj::Own<kj::AsyncIoStream>&& connection) {
             auto conn = kj::heap<WebsocketConnection>(kj::mv(connection), *httpInterface);
-            auto promises = kj::heapArrayBuilder<kj::Promise<void>>(2);
-            promises.add(std::move(conn->pend()));
-            promises.add(std::move(conn->writeTask()));
-            return kj::joinPromises(promises.finish()).attach(std::move(conn));
-        }))
-    );
+            // delete the connection when either the read or write task completes
+            httpConnections.add(conn->pend().exclusiveJoin(conn->writeTask()).attach(kj::mv(conn)));
+            return acceptHttpClient(kj::mv(listener));
+        }));
 }
 
-void Server::acceptRpcClient(kj::Own<kj::ConnectionReceiver>&& listener) {
-    auto ptr = listener.get();
-    tasks.add(ptr->accept().then(kj::mvCapture(kj::mv(listener),
-        [this](kj::Own<kj::ConnectionReceiver>&& listener,
-                            kj::Own<kj::AsyncIoStream>&& connection) {
-            acceptRpcClient(kj::mv(listener));
+kj::Promise<void> Server::acceptRpcClient(kj::Own<kj::ConnectionReceiver>&& listener) {
+    kj::ConnectionReceiver& cr = *listener.get();
+    return cr.accept().then(kj::mvCapture(kj::mv(listener),
+        [this](kj::Own<kj::ConnectionReceiver>&& listener, kj::Own<kj::AsyncIoStream>&& connection) {
             auto server = kj::heap<RpcConnection>(kj::mv(connection), rpcInterface, capnp::ReaderOptions());
-            tasks.add(server->network.onDisconnect().attach(kj::mv(server)));
-        }))
-    );
+            childTasks.add(server->network.onDisconnect().attach(kj::mv(server)));
+            return acceptRpcClient(kj::mv(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, char* buffer, std::function<void(const char*,size_t)> cb) {
+    return stream->tryRead(buffer, 1, PROC_IO_BUFSIZE).then([this,stream,buffer,cb](size_t sz) {
         if(sz > 0) {
-            return handleProcessOutput(stream, readCb);
+            cb(buffer, sz);
+            return handleFdRead(stream, kj::mv(buffer), cb);
         }
         return kj::Promise<void>(kj::READY_NOW);
     });
 }
+
+void Server::taskFailed(kj::Exception &&exception) {
+    // An unexpected http connection close can cause an exception, so don't re-throw.
+    // TODO: consider re-throwing selected exceptions
+    LLOG(INFO, exception);
+    //kj::throwFatalException(kj::mv(exception));
+}

src/server.h

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-2017 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_SERVER_H_
-#define _LAMINAR_SERVER_H_
+#ifndef LAMINAR_SERVER_H_
+#define LAMINAR_SERVER_H_
 
 #include <kj/async-io.h>
 #include <capnp/message.h>
@@ -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,25 +38,43 @@ 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(const char*,size_t)> cb);
+
+    // add a one-shot timer callback
+    kj::Promise<void> addTimeout(int seconds, std::function<void()> cb);
+
+    // add a path to be watched for changes
+    void addWatchPath(const char* dpath);
 
 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> acceptHttpClient(kj::Own<kj::ConnectionReceiver>&& listener);
+    kj::Promise<void> acceptRpcClient(kj::Own<kj::ConnectionReceiver>&& listener);
+    kj::Promise<void> handleFdRead(kj::AsyncInputStream* stream, char* buffer, std::function<void(const char*,size_t)> cb);
 
-    void taskFailed(kj::Exception&& exception) override {
-        kj::throwFatalException(kj::mv(exception));
-    }
+    void taskFailed(kj::Exception&& exception) override;
 
 private:
-    int efd;
-    capnp::Capability::Client rpcInterface;
     struct WebsocketConnection;
-    struct HttpImpl;
-    HttpImpl* httpInterface;
+    class HttpImpl;
+
+    int efd_quit;
+    capnp::Capability::Client rpcInterface;
+    LaminarInterface& laminarInterface;
+    kj::Own<HttpImpl> httpInterface;
     kj::AsyncIoContext ioContext;
-    kj::TaskSet tasks;
+    kj::Own<kj::TaskSet> listeners;
+    kj::TaskSet childTasks;
+    kj::TaskSet httpConnections;
+    kj::Maybe<kj::Promise<void>> reapWatch;
+    int inotify_fd;
+    kj::Maybe<kj::Promise<void>> pathWatch;
+
+    // TODO: restructure so this isn't necessary
+    friend class ServerTest;
+    kj::PromiseFulfillerPair<void> httpReady;
 };
 
-#endif // _LAMINAR_SERVER_H_
+#endif // LAMINAR_SERVER_H_

test/test-conf.cpp

@@ -0,0 +1,63 @@
+///
+/// Copyright 2018 Oliver Giles
+///
+/// This file is part of Laminar
+///
+/// Laminar is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Laminar is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/// GNU General Public License for more details.
+///
+/// You should have received a copy of the GNU General Public License
+/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
+///
+#include <gtest/gtest.h>
+#include "conf.h"
+
+class ConfTest : public ::testing::Test {
+protected:
+    void SetUp() override {
+        fd = mkstemp(tmpFile);
+    }
+    void TearDown() override {
+        close(fd);
+        unlink(tmpFile);
+    }
+    void parseConf(std::string conf) {
+        lseek(fd, SEEK_SET, 0);
+        write(fd, conf.data(), conf.size());
+        cfg = parseConfFile(tmpFile);
+    }
+    StringMap cfg;
+    int fd;
+    char tmpFile[32] = "/tmp/lt.XXXXXX";
+};
+
+TEST_F(ConfTest, Empty) {
+    EXPECT_TRUE(cfg.empty());
+    parseConf("");
+    EXPECT_TRUE(cfg.empty());
+}
+
+TEST_F(ConfTest, Comments) {
+    parseConf("#");
+    EXPECT_TRUE(cfg.empty());
+    parseConf("#foo=bar");
+    EXPECT_TRUE(cfg.empty());
+}
+
+TEST_F(ConfTest, Parse) {
+    parseConf("foo=bar\nbar=3");
+    ASSERT_EQ(2, cfg.size());
+    EXPECT_EQ("bar", cfg.get("foo", std::string("fallback")));
+    EXPECT_EQ(3, cfg.get("bar", 0));
+}
+
+TEST_F(ConfTest, Fallback) {
+    EXPECT_EQ("foo", cfg.get("test", std::string("foo")));
+}

test/test-database.cpp

@@ -0,0 +1,75 @@
+///
+/// Copyright 2018 Oliver Giles
+///
+/// This file is part of Laminar
+///
+/// Laminar is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Laminar is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/// GNU General Public License for more details.
+///
+/// You should have received a copy of the GNU General Public License
+/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
+///
+#include <gtest/gtest.h>
+#include "database.h"
+
+class DatabaseTest : public ::testing::Test {
+protected:
+    DatabaseTest() :
+        ::testing::Test(),
+        db(":memory:")
+    {}
+    Database db;
+};
+
+TEST_F(DatabaseTest, Exec) {
+    EXPECT_FALSE(db.exec("garbage non-sql"));
+    EXPECT_TRUE(db.exec("create temporary table test(id int)"));
+}
+
+TEST_F(DatabaseTest, Fetch) {
+    int n = 0;
+    db.stmt("select 2, 'cat', 4294967299").fetch<int, std::string, uint64_t>([&](int i, std::string s, uint64_t ui){
+        n++;
+        EXPECT_EQ(2, i);
+        EXPECT_EQ("cat", s);
+        EXPECT_EQ(4294967299, ui);
+    });
+    EXPECT_EQ(1, n);
+}
+
+TEST_F(DatabaseTest, Bind) {
+    int n = 0;
+    db.stmt("select ? * 2").bind(2).fetch<int>([&](int i){
+        n++;
+        EXPECT_EQ(4, i);
+    });
+    EXPECT_EQ(1, n);
+}
+
+TEST_F(DatabaseTest, Strings) {
+    std::string res;
+    db.stmt("select ? || ?").bind("a", "b").fetch<std::string>([&res](std::string s){
+        EXPECT_TRUE(res.empty());
+        res = s;
+    });
+    EXPECT_EQ("ab", res);
+}
+
+TEST_F(DatabaseTest, MultiRow) {
+    ASSERT_TRUE(db.exec("create table test(id int)"));
+    int i = 0;
+    while(i < 10)
+        EXPECT_TRUE(db.stmt("insert into test values(?)").bind(i++).exec());
+    i = 0;
+    db.stmt("select * from test").fetch<int>([&](int r){
+        EXPECT_EQ(i++, r);
+    });
+    EXPECT_EQ(10, i);
+}

test/test-laminar.cpp

@@ -0,0 +1,43 @@
+///
+/// Copyright 2018 Oliver Giles
+///
+/// This file is part of Laminar
+///
+/// Laminar is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Laminar is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/// GNU General Public License for more details.
+///
+/// You should have received a copy of the GNU General Public License
+/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
+///
+#include <gtest/gtest.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/document.h>
+#include "laminar.h"
+
+class TestLaminarClient : public LaminarClient {
+public:
+    virtual void sendMessage(std::string p) { payload = p; }
+    std::string payload;
+};
+
+class LaminarTest : public ::testing::Test {
+protected:
+    Laminar laminar;
+};
+
+TEST_F(LaminarTest, StatusMessageContainsTime) {
+    TestLaminarClient testClient;
+    laminar.sendStatus(&testClient);
+    rapidjson::Document d;
+    d.Parse(testClient.payload.c_str());
+    ASSERT_TRUE(d.IsObject());
+    ASSERT_TRUE(d.HasMember("time"));
+    EXPECT_GE(1, d["time"].GetInt() - time(nullptr));
+}

test/test-run.cpp

@@ -0,0 +1,122 @@
+///
+/// Copyright 2018 Oliver Giles
+///
+/// This file is part of Laminar
+///
+/// Laminar is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Laminar is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/// GNU General Public License for more details.
+///
+/// You should have received a copy of the GNU General Public License
+/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
+///
+#include <gtest/gtest.h>
+#include "run.h"
+#include "log.h"
+#include "node.h"
+#include "conf.h"
+
+class RunTest : public ::testing::Test {
+protected:
+    virtual ~RunTest() noexcept override {}
+
+    void SetUp() override {
+        run.node = node;
+    }
+    void wait() {
+        int state = -1;
+        waitpid(run.pid, &state, 0);
+        run.reaped(state);
+    }
+    void runAll() {
+        while(!run.step())
+            wait();
+    }
+    std::string readAllOutput() {
+        std::string res;
+        char tmp[64];
+        for(ssize_t n = read(run.fd, tmp, 64); n > 0; n = read(run.fd, tmp, 64))
+            res += std::string(tmp, n);
+        // strip the first "[laminar] executing.. line
+        return strchr(res.c_str(), '\n') + 1;
+    }
+    StringMap parseFromString(std::string content) {
+        char tmp[16] = "/tmp/lt.XXXXXX";
+        int fd = mkstemp(tmp);
+        write(fd, content.data(), content.size());
+        close(fd);
+        StringMap map = parseConfFile(tmp);
+        unlink(tmp);
+        return map;
+    }
+
+    class Run run;
+    std::shared_ptr<Node> node = std::shared_ptr<Node>(new Node);
+};
+
+TEST_F(RunTest, WorkingDirectory) {
+    run.addScript("/bin/pwd", "/home");
+    runAll();
+    EXPECT_EQ("/home\n", readAllOutput());
+}
+
+TEST_F(RunTest, SuccessStatus) {
+    run.addScript("/bin/true");
+    runAll();
+    EXPECT_EQ(RunState::SUCCESS, run.result);
+}
+
+TEST_F(RunTest, FailedStatus) {
+    run.addScript("/bin/false");
+    runAll();
+    EXPECT_EQ(RunState::FAILED, run.result);
+}
+
+TEST_F(RunTest, Environment) {
+    run.name = "foo";
+    run.build = 1234;
+    run.laminarHome = "/tmp";
+    run.addScript("/usr/bin/env");
+    runAll();
+    StringMap map = parseFromString(readAllOutput());
+    EXPECT_EQ("1234", map["RUN"]);
+    EXPECT_EQ("foo", map["JOB"]);
+    EXPECT_EQ("success", map["RESULT"]);
+    EXPECT_EQ("unknown", map["LAST_RESULT"]);
+    EXPECT_EQ("/tmp/run/foo/workspace", map["WORKSPACE"]);
+    EXPECT_EQ("/tmp/archive/foo/1234", map["ARCHIVE"]);
+}
+
+TEST_F(RunTest, ParamsToEnv) {
+    run.params["foo"] = "bar";
+    run.addScript("/usr/bin/env");
+    runAll();
+    StringMap map = parseFromString(readAllOutput());
+    EXPECT_EQ("bar", map["foo"]);
+}
+
+TEST_F(RunTest, Abort) {
+    run.addScript("/usr/bin/yes");
+    run.step();
+    usleep(200); // TODO fix
+    run.abort();
+    wait();
+    EXPECT_EQ(RunState::ABORTED, run.result);
+}
+
+TEST_F(RunTest, AbortAfterFailed) {
+    run.addScript("/bin/false");
+    runAll();
+    run.addScript("/usr/bin/yes");
+    run.step();
+    usleep(200); // TODO fix
+    run.abort();
+    wait();
+    EXPECT_EQ(RunState::FAILED, run.result);
+}

test/test-server.cpp

@@ -0,0 +1,145 @@
+///
+/// Copyright 2018 Oliver Giles
+///
+/// This file is part of Laminar
+///
+/// Laminar is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Laminar is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/// GNU General Public License for more details.
+///
+/// You should have received a copy of the GNU General Public License
+/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
+///
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include <boost/filesystem.hpp>
+#include <thread>
+#include <sys/socket.h>
+#include "server.h"
+#include "log.h"
+#include "interface.h"
+#include "laminar.capnp.h"
+
+namespace fs = boost::filesystem;
+
+class TempDir : public fs::path {
+public:
+    TempDir(const char* tmpl) {
+        char* t = strdup(tmpl);
+        mkdtemp(t);
+        *static_cast<fs::path*>(this) = t;
+        free(t);
+    }
+    ~TempDir() {
+        fs::remove_all(*this);
+    }
+};
+
+class MockLaminar : public LaminarInterface {
+public:
+    LaminarClient* client = nullptr;
+    virtual void registerClient(LaminarClient* c) override {
+        ASSERT_EQ(nullptr, client);
+        client = c;
+        EXPECT_CALL(*this, sendStatus(client)).Times(testing::Exactly(1));
+    }
+
+    virtual void deregisterClient(LaminarClient* c) override {
+        ASSERT_EQ(client, c);
+        client = nullptr;
+    }
+
+    MOCK_METHOD2(queueJob, std::shared_ptr<Run>(std::string name, ParamMap params));
+    MOCK_METHOD1(registerWaiter, void(LaminarWaiter* waiter));
+    MOCK_METHOD1(deregisterWaiter, void(LaminarWaiter* waiter));
+    MOCK_METHOD1(sendStatus, void(LaminarClient* client));
+    MOCK_METHOD4(setParam, bool(std::string job, uint buildNum, std::string param, std::string value));
+    MOCK_METHOD2(getArtefact, bool(std::string path, std::string& result));
+    MOCK_METHOD0(getCustomCss, std::string());
+    MOCK_METHOD0(abortAll, void());
+    MOCK_METHOD0(reapChildren, void());
+    MOCK_METHOD0(notifyConfigChanged, void());
+};
+
+class ServerTest : public ::testing::Test {
+protected:
+    ServerTest() :
+        tempDir("/tmp/laminar-test-XXXXXX")
+    {
+    }
+    void SetUp() override {
+        EXPECT_CALL(mockLaminar, registerWaiter(testing::_));
+        EXPECT_CALL(mockLaminar, deregisterWaiter(testing::_));
+        server = new Server(mockLaminar, "unix:"+fs::path(tempDir/"rpc.sock").string(), "127.0.0.1:8080");
+    }
+    void TearDown() override {
+        delete server;
+    }
+
+    LaminarCi::Client client() const {
+        return server->rpcInterface.castAs<LaminarCi>();
+    }
+    kj::WaitScope& ws() const {
+        return server->ioContext.waitScope;
+    }
+    void waitForHttpReady() {
+        server->httpReady.promise.wait(server->ioContext.waitScope);
+    }
+
+    kj::Network& network() { return server->ioContext.provider->getNetwork(); }
+    TempDir tempDir;
+    MockLaminar mockLaminar;
+    Server* server;
+};
+
+TEST_F(ServerTest, RpcQueue) {
+    auto req = client().queueRequest();
+    req.setJobName("foo");
+    EXPECT_CALL(mockLaminar, queueJob("foo", ParamMap())).Times(testing::Exactly(1));
+    req.send().wait(ws());
+}
+
+// Tests that agressively closed websockets are properly removed
+// and will not be attempted to be contacted again
+TEST_F(ServerTest, HttpWebsocketRST) {
+    waitForHttpReady();
+
+    // TODO: generalize
+    constexpr const char* WS =
+        "GET / HTTP/1.1\r\n"
+        "Host: localhost:8080\r\n"
+        "Connection: Upgrade\r\n"
+        "Upgrade: websocket\r\n"
+        "Sec-WebSocket-Key: GTFmrUCM9N6B32LdDE3Rzw==\r\n"
+        "Sec-WebSocket-Version: 13\r\n\r\n";
+
+    static char buffer[256];
+    network().parseAddress("localhost:8080").then([this](kj::Own<kj::NetworkAddress>&& addr){
+        return addr->connect().attach(kj::mv(addr)).then([this](kj::Own<kj::AsyncIoStream>&& stream){
+            kj::AsyncIoStream* s = stream.get();
+            return s->write(WS, strlen(WS)).then([this,s](){
+                // Read the websocket header response, ensure the client has been registered
+                return s->tryRead(buffer, 64, 256).then([this,s](size_t sz){
+                    EXPECT_LE(64, sz);
+                    EXPECT_NE(nullptr, mockLaminar.client);
+                    // agressively abort the connection
+                    struct linger so_linger;
+                    so_linger.l_onoff = 1;
+                    so_linger.l_linger = 0;
+                    s->setsockopt(SOL_SOCKET, SO_LINGER, &so_linger, sizeof(so_linger));
+                    return kj::Promise<void>(kj::READY_NOW);
+                });
+            }).attach(kj::mv(stream));
+        });
+    }).wait(ws());
+    ws().poll();
+    // Expect that the client has been cleared. If it has not, Laminar could
+    // try to write to the closed file descriptor, causing an exception
+    EXPECT_EQ(nullptr, mockLaminar.client);
+}