diff --git a/extra/webapps/mason/mason.factor b/extra/webapps/mason/mason.factor
index 63b042077e..6cb24a5f9a 100644
--- a/extra/webapps/mason/mason.factor
+++ b/extra/webapps/mason/mason.factor
@@ -2,9 +2,15 @@
! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays combinators db db.tuples furnace.actions
http.server.responses kernel mason.platform mason.notify.server
-math.order sequences sorting splitting xml.syntax xml.writer ;
+math.order sequences sorting splitting xml.syntax xml.writer
+io.pathnames io.encodings.utf8 io.files ;
IN: webapps.mason
+: log-file ( -- path ) home "mason.log" append-path ;
+
+: recent-events ( -- xml )
+ log-file utf8 file-lines 10 short tail* "\n" join [XML <->
XML] ;
+
: git-link ( id -- link )
[ "http://github.com/slavapestov/factor/commit/" prepend ] keep
[XML ><-> XML] ;
@@ -55,20 +61,24 @@ IN: webapps.mason
XML] ;
-: machine-report ( builders -- xml )
- [ machine-table ] map
+: machine-report ( -- xml )
+ builder new select-tuples
+ [ [ [ os>> ] [ cpu>> ] bi 2array ] compare ] sort
+ [ machine-table ] map ;
+
+: build-farm-report ( -- xml )
+ recent-events
+ machine-report
[XML
- Build farm status
- <->
+
+ Factor build farm
+ Recent events
<-> Machine status
<->
+
XML] ;
: ( -- action )
[
- mason-db [
- builder new select-tuples
- [ [ [ os>> ] [ cpu>> ] bi 2array ] compare ] sort
- machine-report xml>string
- ] with-db
+ mason-db [ build-farm-report xml>string ] with-db
"text/html"
] >>display ;
\ No newline at end of file