add a webserver running webmachine, with hooks for plugins

ChangeLog

@@ -1,3 +1,6 @@
+* Tue Oct 08 2013 Anthony Molinaro <[email protected]> 1.1.0
+- integrate webmachine and the file based trace console
+
 * Wed Sep 18 2013 Anthony Molinaro <[email protected]> 1.0.2
 - numeric trace ids sometimes come in which breaks the trace, so normalize
 to binary

Makefile.am.local

@@ -1,3 +1,8 @@
 # put whatever (auto)make commands here, they will be included from Makefile.am
 confdir = /etc/mondemand
 dist_conf_DATA = mondemand_server.config
+
+include $(top_srcdir)/Makefile.otp
+
+appprivdir="$(erlappdir)"
+nobase_dist_apppriv_DATA = $(shell if test -d priv -o -h priv ; then find priv -follow -type f ; fi)

fw-pkgin/config

@@ -2,7 +2,7 @@
 # variable FW_PACKAGE_DEFAULT_MAINTAINER if non-empty at init time
 
 FW_PACKAGE_NAME="mondemand-server"
-FW_PACKAGE_VERSION="1.0.2"
+FW_PACKAGE_VERSION="1.1.0"
 FW_PACKAGE_MAINTAINER="Anthony Molinaro <[email protected]>"
 FW_PACKAGE_SHORT_DESCRIPTION="A Server for dealing with mondemand events"
 FW_PACKAGE_DESCRIPTION=`cat README`
@@ -15,15 +15,19 @@ FW_PACKAGE_ARCHITECTURE_DEPENDENT="1"
 # For other packaging systems, the syntax is translated for you.
 
 FW_PACKAGE_DEPENDS="
-  lwes-erlang (>= 2.2.0) | erlang-r15b-lwes (>= 2.2.0)
+  lwes-erlang (>= 2.2.0) | erlang-r15b-lwes (>= 2.2.0),
+  mochiweb (>= 2.6.0) | erlang-r15b-mochiweb (>= 2.6.0),
+  webmachine (>= 1.10.3) | erlang-r15b-webmachine (>= 1.10.3)
 "
 FW_PACKAGE_CONFLICTS=""
 FW_PACKAGE_PROVIDES=""
 FW_PACKAGE_REPLACES=""
 FW_PACKAGE_SUGGESTS=""
 
 FW_PACKAGE_BUILD_DEPENDS="
-  lwes-erlang (>= 2.2.0) | erlang-r15b-lwes (>= 2.2.0)
+  lwes-erlang (>= 2.2.0) | erlang-r15b-lwes (>= 2.2.0),
+  mochiweb (>= 2.6.0) | erlang-r15b-mochiweb (>= 2.6.0),
+  webmachine (>= 1.10.3) | erlang-r15b-webmachine (>= 1.10.3)
 "
 FW_PACKAGE_BUILD_CONFLICTS=""
 
@@ -87,7 +91,7 @@ FW_ERL_APP_NAME="mondemand_server"
 # uncomment to indicate additional OTP applications (besides kernel and stdlib)
 # that this application depends upon.  should be an erlang expression which 
 # evaluates to a list.
-FW_ERL_PREREQ_APPLICATIONS_EXTRA="[lwes]"
+FW_ERL_PREREQ_APPLICATIONS_EXTRA="[lwes, crypto, inets, public_key, ssl, xmerl, compiler, syntax_tools, mochiweb, webmachine]"
 
 # uncomment to add arbitrary extra content to the app file, e.g., an
 # included application directive.  should be an erlang expression which 

mondemand_server.config

@@ -15,6 +15,22 @@
         ]
       },
 
+      % config for web server
+      { web,
+        [ { ip, "0.0.0.0" }, % bind to all interfaces
+          { port, 20602 },   % port to bind on
+          { log_dir, "/tmp/data/httpd/logs" },
+          { dispatch,
+            [
+              {["tools", '*'],
+                mondemand_server_fs_resource, [ {root, "../priv/www" } ] },
+              {["data", '*'],
+                mondemand_server_fs_resource, [ {root, "/tmp/data"} ] }
+            ]
+          }
+        ]
+      },
+
       % config for particular modules
       { mondemand_backend_all_journaller,
         [
@@ -45,7 +61,28 @@
           { extra_fields, [ ] },
 
           % the directory to store traces
-          { root, ["/", "tmp","data","trace"] }
+          { root, ["/", "tmp","data","trace"] },
+
+          { dispatch,
+            [
+              { ["trace", owner, id, file],
+                mondemand_backend_trace_resource,
+                [ {root, "/tmp/data" } ]
+              },
+              { ["trace", owner, id],
+                mondemand_backend_trace_resource,
+                [ {root, "/tmp/data" } ]
+              },
+              { ["trace", owner],
+                mondemand_backend_trace_resource,
+                [ {root, "/tmp/data" } ]
+              },
+              { ["trace"],
+                mondemand_backend_trace_resource,
+                [ {root, "/tmp/data" } ]
+              }
+            ]
+          }
         ]
       }
     ]

priv/www/js/date.format.js

@@ -0,0 +1,126 @@
+/*
+ * Date Format 1.2.3
+ * (c) 2007-2009 Steven Levithan <stevenlevithan.com>
+ * MIT license
+ *
+ * Includes enhancements by Scott Trenda <scott.trenda.net>
+ * and Kris Kowal <cixar.com/~kris.kowal/>
+ *
+ * Accepts a date, a mask, or a date and a mask.
+ * Returns a formatted version of the given date.
+ * The date defaults to the current date/time.
+ * The mask defaults to dateFormat.masks.default.
+ */
+
+var dateFormat = function () {
+	var	token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
+		timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g,
+		timezoneClip = /[^-+\dA-Z]/g,
+		pad = function (val, len) {
+			val = String(val);
+			len = len || 2;
+			while (val.length < len) val = "0" + val;
+			return val;
+		};
+
+	// Regexes and supporting functions are cached through closure
+	return function (date, mask, utc) {
+		var dF = dateFormat;
+
+		// You can't provide utc if you skip other args (use the "UTC:" mask prefix)
+		if (arguments.length == 1 && Object.prototype.toString.call(date) == "[object String]" && !/\d/.test(date)) {
+			mask = date;
+			date = undefined;
+		}
+
+		// Passing date through Date applies Date.parse, if necessary
+		date = date ? new Date(date) : new Date;
+		if (isNaN(date)) throw SyntaxError("invalid date");
+
+		mask = String(dF.masks[mask] || mask || dF.masks["default"]);
+
+		// Allow setting the utc argument via the mask
+		if (mask.slice(0, 4) == "UTC:") {
+			mask = mask.slice(4);
+			utc = true;
+		}
+
+		var	_ = utc ? "getUTC" : "get",
+			d = date[_ + "Date"](),
+			D = date[_ + "Day"](),
+			m = date[_ + "Month"](),
+			y = date[_ + "FullYear"](),
+			H = date[_ + "Hours"](),
+			M = date[_ + "Minutes"](),
+			s = date[_ + "Seconds"](),
+			L = date[_ + "Milliseconds"](),
+			o = utc ? 0 : date.getTimezoneOffset(),
+			flags = {
+				d:    d,
+				dd:   pad(d),
+				ddd:  dF.i18n.dayNames[D],
+				dddd: dF.i18n.dayNames[D + 7],
+				m:    m + 1,
+				mm:   pad(m + 1),
+				mmm:  dF.i18n.monthNames[m],
+				mmmm: dF.i18n.monthNames[m + 12],
+				yy:   String(y).slice(2),
+				yyyy: y,
+				h:    H % 12 || 12,
+				hh:   pad(H % 12 || 12),
+				H:    H,
+				HH:   pad(H),
+				M:    M,
+				MM:   pad(M),
+				s:    s,
+				ss:   pad(s),
+				l:    pad(L, 3),
+				L:    L, //pad(L > 99 ? Math.round(L / 10) : L),
+				t:    H < 12 ? "a"  : "p",
+				tt:   H < 12 ? "am" : "pm",
+				T:    H < 12 ? "A"  : "P",
+				TT:   H < 12 ? "AM" : "PM",
+				Z:    utc ? "UTC" : (String(date).match(timezone) || [""]).pop().replace(timezoneClip, ""),
+				o:    (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
+				S:    ["th", "st", "nd", "rd"][d % 10 > 3 ? 0 : (d % 100 - d % 10 != 10) * d % 10]
+			};
+
+		return mask.replace(token, function ($0) {
+			return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
+		});
+	};
+}();
+
+// Some common format strings
+dateFormat.masks = {
+	"default":      "ddd mmm dd yyyy HH:MM:ss",
+	shortDate:      "m/d/yy",
+	mediumDate:     "mmm d, yyyy",
+	longDate:       "mmmm d, yyyy",
+	fullDate:       "dddd, mmmm d, yyyy",
+	shortTime:      "h:MM TT",
+	mediumTime:     "h:MM:ss TT",
+	longTime:       "h:MM:ss TT Z",
+	isoDate:        "yyyy-mm-dd",
+	isoTime:        "HH:MM:ss",
+	isoDateTime:    "yyyy-mm-dd'T'HH:MM:ss",
+	isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
+};
+
+// Internationalization strings
+dateFormat.i18n = {
+	dayNames: [
+		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
+		"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
+	],
+	monthNames: [
+		"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+		"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
+	]
+};
+
+// For convenience...
+Date.prototype.format = function (mask, utc) {
+	return dateFormat(this, mask, utc);
+};
+