logster 1.3.0 → 1.3.1

data/client-app/app/components/update-time.js

@@ -1,21 +1,21 @@
-import Component from "@ember/component";
-import { formatTime } from "client-app/lib/utilities";
-
-export default Component.extend({
-  didInsertElement() {
-    const updateTimes = () => {
-      Em.$(".auto-update-time").each(function() {
-        const timestamp = parseInt(this.getAttribute("data-timestamp"), 10);
-        const elem = this;
-        const text = formatTime(timestamp);
-
-        if (text !== elem.innerText) {
-          elem.innerText = text;
-        }
-      });
-      Em.run.later(updateTimes, 60000);
-    };
-
-    Em.run.later(updateTimes, 60000);
-  }
-});
+import Component from "@ember/component";
+import { formatTime } from "client-app/lib/utilities";
+
+export default Component.extend({
+  didInsertElement() {
+    const updateTimes = () => {
+      Em.$(".auto-update-time").each(function() {
+        const timestamp = parseInt(this.getAttribute("data-timestamp"), 10);
+        const elem = this;
+        const text = formatTime(timestamp);
+
+        if (text !== elem.innerText) {
+          elem.innerText = text;
+        }
+      });
+      Em.run.later(updateTimes, 60000);
+    };
+
+    Em.run.later(updateTimes, 60000);
+  }
+});

data/client-app/app/controllers/index.js

@@ -1,83 +1,83 @@
-import Controller from "@ember/controller";
-import { ajax } from "client-app/lib/utilities";
-import { observer } from "@ember/object";
-
-export default Controller.extend({
-  currentMessage: Em.computed.alias("model.currentMessage"),
-
-  actions: {
-    expandMessage(message) {
-      message.expand();
-    },
-
-    selectMessage(message) {
-      const old = this.get("currentMessage");
-      if (old) {
-        old.set("selected", false);
-      }
-
-      message.set("selected", true);
-      this.set("currentMessage", message);
-    },
-
-    showMoreBefore() {
-      this.get("model").showMoreBefore();
-    },
-
-    loadMore() {
-      return this.get("model").loadMore();
-    },
-
-    clear() {
-      if (confirm("Clear the logs?\n\nCancel = No, OK = Clear")) {
-        ajax("/clear", { type: "POST" }).then(() => {
-          this.get("model").reload();
-        });
-      }
-    },
-
-    removeMessage(msg) {
-      const messages = this.get("model");
-      messages.destroy(msg);
-    },
-
-    solveMessage(msg) {
-      const messages = this.get("model");
-      messages.solve(msg);
-    }
-  },
-
-  filterChanged: observer(
-    "showDebug",
-    "showInfo",
-    "showWarn",
-    "showErr",
-    "showFatal",
-    function() {
-      const filter = [];
-      ["Debug", "Info", "Warn", "Err", "Fatal"].forEach((severity, index) => {
-        if (this.get(`show${severity}`)) {
-          filter.push(index);
-        }
-      });
-
-      // always show unknown, rare
-      filter.push(5);
-      const model = this.get("model");
-      model.set("filter", filter);
-      if (this.get("initialized")) {
-        model.reload();
-      }
-    }
-  ),
-
-  searchChanged: observer("search", function() {
-    const search = this.get("search");
-    const model = this.get("model");
-    model.set("search", search);
-
-    if (this.get("initialized")) {
-      model.reload();
-    }
-  })
-});
+import Controller from "@ember/controller";
+import { ajax } from "client-app/lib/utilities";
+import { observer } from "@ember/object";
+
+export default Controller.extend({
+  currentMessage: Em.computed.alias("model.currentMessage"),
+
+  actions: {
+    expandMessage(message) {
+      message.expand();
+    },
+
+    selectMessage(message) {
+      const old = this.get("currentMessage");
+      if (old) {
+        old.set("selected", false);
+      }
+
+      message.set("selected", true);
+      this.set("currentMessage", message);
+    },
+
+    showMoreBefore() {
+      this.get("model").showMoreBefore();
+    },
+
+    loadMore() {
+      return this.get("model").loadMore();
+    },
+
+    clear() {
+      if (confirm("Clear the logs?\n\nCancel = No, OK = Clear")) {
+        ajax("/clear", { type: "POST" }).then(() => {
+          this.get("model").reload();
+        });
+      }
+    },
+
+    removeMessage(msg) {
+      const messages = this.get("model");
+      messages.destroy(msg);
+    },
+
+    solveMessage(msg) {
+      const messages = this.get("model");
+      messages.solve(msg);
+    }
+  },
+
+  filterChanged: observer(
+    "showDebug",
+    "showInfo",
+    "showWarn",
+    "showErr",
+    "showFatal",
+    function() {
+      const filter = [];
+      ["Debug", "Info", "Warn", "Err", "Fatal"].forEach((severity, index) => {
+        if (this.get(`show${severity}`)) {
+          filter.push(index);
+        }
+      });
+
+      // always show unknown, rare
+      filter.push(5);
+      const model = this.get("model");
+      model.set("filter", filter);
+      if (this.get("initialized")) {
+        model.reload();
+      }
+    }
+  ),
+
+  searchChanged: observer("search", function() {
+    const search = this.get("search");
+    const model = this.get("model");
+    model.set("search", search);
+
+    if (this.get("initialized")) {
+      model.reload();
+    }
+  })
+});

data/client-app/app/controllers/show.js

@@ -1,13 +1,13 @@
-import Controller from "@ember/controller";
-
-export default Controller.extend({
-  actions: {
-    protect() {
-      this.get("model").protect();
-    },
-
-    unprotect() {
-      this.get("model").unprotect();
-    }
-  }
-});
+import Controller from "@ember/controller";
+
+export default Controller.extend({
+  actions: {
+    protect() {
+      this.get("model").protect();
+    },
+
+    unprotect() {
+      this.get("model").unprotect();
+    }
+  }
+});

data/client-app/app/index.html

@@ -1,29 +1,29 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>ClientApp</title>
-    <meta name="description" content="">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta id="preloaded-data" data-root-path="/logs" data-preloaded="{}">
-
-    {{content-for "head"}}
-
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/client-app.css">
-
-    <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
-    <link href='//fonts.googleapis.com/css?family=Roboto+Mono' rel='stylesheet' type='text/css'>
-
-    {{content-for "head-footer"}}
-  </head>
-  <body>
-    {{content-for "body"}}
-
-    <script src="{{rootURL}}assets/vendor.js"></script>
-    <script src="{{rootURL}}assets/client-app.js"></script>
-
-    {{content-for "body-footer"}}
-  </body>
-</html>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>ClientApp</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta id="preloaded-data" data-root-path="/logs" data-preloaded="{}">
+
+    {{content-for "head"}}
+
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/client-app.css">
+
+    <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
+    <link href='//fonts.googleapis.com/css?family=Roboto+Mono' rel='stylesheet' type='text/css'>
+
+    {{content-for "head-footer"}}
+  </head>
+  <body>
+    {{content-for "body"}}
+
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/client-app.js"></script>
+
+    {{content-for "body-footer"}}
+  </body>
+</html>

data/client-app/app/initializers/app-init.js

@@ -1,55 +1,55 @@
-import {
-  updateHiddenProperty,
-  resetTitleCount
-} from "client-app/lib/utilities";
-import { init } from "client-app/lib/preload";
-
-export function initialize() {
-  // config for moment.js
-  moment.updateLocale("en", {
-    relativeTime: {
-      future: "in %s",
-      past: "%s ago",
-      s: "secs",
-      m: "a min",
-      mm: "%d mins",
-      h: "an hr",
-      hh: "%d hrs",
-      d: "a day",
-      dd: "%d days",
-      M: "a mth",
-      MM: "%d mths",
-      y: "a yr",
-      yy: "%d yrs"
-    }
-  });
-
-  // parse preloaded json
-  const dataset = document.getElementById("preloaded-data").dataset;
-  init(dataset);
-
-  // setup event for updating document title and title count
-  let hiddenProperty;
-  let visibilitychange;
-
-  ["", "webkit", "ms", "moz", "ms"].forEach(prefix => {
-    const check = prefix + (prefix === "" ? "hidden" : "Hidden");
-    if (document[check] !== undefined && !hiddenProperty) {
-      hiddenProperty = check;
-      visibilitychange = prefix + "visibilitychange";
-    }
-  });
-
-  updateHiddenProperty(hiddenProperty);
-  document.addEventListener(
-    visibilitychange,
-    () => {
-      resetTitleCount();
-    },
-    false
-  );
-}
-
-export default {
-  initialize
-};
+import {
+  updateHiddenProperty,
+  resetTitleCount
+} from "client-app/lib/utilities";
+import { init } from "client-app/lib/preload";
+
+export function initialize() {
+  // config for moment.js
+  moment.updateLocale("en", {
+    relativeTime: {
+      future: "in %s",
+      past: "%s ago",
+      s: "secs",
+      m: "a min",
+      mm: "%d mins",
+      h: "an hr",
+      hh: "%d hrs",
+      d: "a day",
+      dd: "%d days",
+      M: "a mth",
+      MM: "%d mths",
+      y: "a yr",
+      yy: "%d yrs"
+    }
+  });
+
+  // parse preloaded json
+  const dataset = document.getElementById("preloaded-data").dataset;
+  init(dataset);
+
+  // setup event for updating document title and title count
+  let hiddenProperty;
+  let visibilitychange;
+
+  ["", "webkit", "ms", "moz", "ms"].forEach(prefix => {
+    const check = prefix + (prefix === "" ? "hidden" : "Hidden");
+    if (document[check] !== undefined && !hiddenProperty) {
+      hiddenProperty = check;
+      visibilitychange = prefix + "visibilitychange";
+    }
+  });
+
+  updateHiddenProperty(hiddenProperty);
+  document.addEventListener(
+    visibilitychange,
+    () => {
+      resetTitleCount();
+    },
+    false
+  );
+}
+
+export default {
+  initialize
+};

data/client-app/app/lib/preload.js

@@ -1,14 +1,14 @@
-let CONTAINER;
-
-export function init(dataset) {
-  CONTAINER = {
-    rootPath: dataset.rootPath,
-    preload: JSON.parse(dataset.preloaded)
-  };
-}
-
-export default {
-  get(key) {
-    return Em.get(CONTAINER, key);
-  }
-};
+let CONTAINER;
+
+export function init(dataset) {
+  CONTAINER = {
+    rootPath: dataset.rootPath,
+    preload: JSON.parse(dataset.preloaded)
+  };
+}
+
+export default {
+  get(key) {
+    return Em.get(CONTAINER, key);
+  }
+};

data/client-app/app/lib/utilities.js

@@ -1,140 +1,140 @@
-import Preload from "client-app/lib/preload";
-
-const entityMap = {
-  "&": "&",
-  "<": "&lt;",
-  ">": "&gt;",
-  '"': "&quot;",
-  "'": "&#39;",
-  "/": "&#x2F;"
-};
-
-export function escapeHtml(string) {
-  return String(string).replace(/[&<>"'/]/g, s => entityMap[s]);
-}
-
-export function ajax(url, settings) {
-  settings = settings || {};
-  settings.headers = settings.headers || {};
-  settings.headers["X-SILENCE-LOGGER"] = true;
-  return Em.$.ajax(Preload.get("rootPath") + url, settings);
-}
-
-export function preloadOrAjax(url, settings) {
-  const preloaded = Preload.get(`preload.${url.replace(".json", "")}`);
-  if (preloaded) {
-    return Em.RSVP.resolve(preloaded);
-  } else {
-    return ajax(url, settings);
-  }
-}
-
-let HIDDEN_PROPERTY;
-let TITLE;
-let TITLE_COUNT;
-
-export function updateHiddenProperty(property) {
-  HIDDEN_PROPERTY = property;
-}
-
-export function isHidden() {
-  if (HIDDEN_PROPERTY !== undefined) {
-    return document[HIDDEN_PROPERTY];
-  } else {
-    return !document.hasFocus;
-  }
-}
-
-export function increaseTitleCount(increment) {
-  if (!isHidden()) {
-    return;
-  }
-  TITLE = TITLE || document.title;
-  TITLE_COUNT = TITLE_COUNT || 0;
-  TITLE_COUNT += increment;
-  document.title = `${TITLE} (${TITLE_COUNT})`;
-}
-
-export function resetTitleCount() {
-  TITLE_COUNT = 0;
-  document.title = TITLE || document.title;
-}
-
-export function formatTime(timestamp) {
-  let formatted;
-  const time = moment(timestamp);
-  const now = moment();
-
-  if (time.diff(now.startOf("day")) > 0) {
-    formatted = time.format("h:mm a");
-  } else {
-    if (time.diff(now.startOf("week")) > 0) {
-      formatted = time.format("dd h:mm a");
-    } else {
-      if (time.diff(now.startOf("year")) > 0) {
-        formatted = time.format("D MMM h:mm a");
-      } else {
-        formatted = time.format("D MMM YY");
-      }
-    }
-  }
-
-  return formatted;
-}
-
-export function buildArrayString(array) {
-  const buffer = [];
-  array.forEach(v => {
-    if (v === null) {
-      buffer.push("null");
-    } else if (Object.prototype.toString.call(v) === "[object Array]") {
-      buffer.push(buildArrayString(v));
-    } else {
-      buffer.push(escapeHtml(v.toString()));
-    }
-  });
-  return "[" + buffer.join(", ") + "]";
-}
-
-export function buildHashString(hash, recurse) {
-  if (!hash) return "";
-
-  const buffer = [];
-  const hashes = [];
-  _.each(hash, (v, k) => {
-    if (v === null) {
-      buffer.push("null");
-    } else if (Object.prototype.toString.call(v) === "[object Array]") {
-      buffer.push(
-        "<tr><td>" +
-          escapeHtml(k) +
-          "</td><td>" +
-          buildArrayString(v) +
-          "</td></tr>"
-      );
-    } else if (typeof v === "object") {
-      hashes.push(k);
-    } else {
-      buffer.push(
-        "<tr><td>" + escapeHtml(k) + "</td><td>" + escapeHtml(v) + "</td></tr>"
-      );
-    }
-  });
-
-  if (_.size(hashes) > 0) {
-    _.each(hashes, function(k1) {
-      const v = hash[k1];
-      buffer.push("<tr><td></td><td><table>");
-      buffer.push(
-        "<td>" +
-          escapeHtml(k1) +
-          "</td><td>" +
-          buildHashString(v, true) +
-          "</td>"
-      );
-      buffer.push("</table></td></tr>");
-    });
-  }
-  const className = recurse ? "" : "env-table";
-  return "<table class='" + className + "'>" + buffer.join("\n") + "</table>";
-}
+import Preload from "client-app/lib/preload";
+
+const entityMap = {
+  "&": "&amp;",
+  "<": "&lt;",
+  ">": "&gt;",
+  '"': "&quot;",
+  "'": "&#39;",
+  "/": "&#x2F;"
+};
+
+export function escapeHtml(string) {
+  return String(string).replace(/[&<>"'/]/g, s => entityMap[s]);
+}
+
+export function ajax(url, settings) {
+  settings = settings || {};
+  settings.headers = settings.headers || {};
+  settings.headers["X-SILENCE-LOGGER"] = true;
+  return Em.$.ajax(Preload.get("rootPath") + url, settings);
+}
+
+export function preloadOrAjax(url, settings) {
+  const preloaded = Preload.get(`preload.${url.replace(".json", "")}`);
+  if (preloaded) {
+    return Em.RSVP.resolve(preloaded);
+  } else {
+    return ajax(url, settings);
+  }
+}
+
+let HIDDEN_PROPERTY;
+let TITLE;
+let TITLE_COUNT;
+
+export function updateHiddenProperty(property) {
+  HIDDEN_PROPERTY = property;
+}
+
+export function isHidden() {
+  if (HIDDEN_PROPERTY !== undefined) {
+    return document[HIDDEN_PROPERTY];
+  } else {
+    return !document.hasFocus;
+  }
+}
+
+export function increaseTitleCount(increment) {
+  if (!isHidden()) {
+    return;
+  }
+  TITLE = TITLE || document.title;
+  TITLE_COUNT = TITLE_COUNT || 0;
+  TITLE_COUNT += increment;
+  document.title = `${TITLE} (${TITLE_COUNT})`;
+}
+
+export function resetTitleCount() {
+  TITLE_COUNT = 0;
+  document.title = TITLE || document.title;
+}
+
+export function formatTime(timestamp) {
+  let formatted;
+  const time = moment(timestamp);
+  const now = moment();
+
+  if (time.diff(now.startOf("day")) > 0) {
+    formatted = time.format("h:mm a");
+  } else {
+    if (time.diff(now.startOf("week")) > 0) {
+      formatted = time.format("dd h:mm a");
+    } else {
+      if (time.diff(now.startOf("year")) > 0) {
+        formatted = time.format("D MMM h:mm a");
+      } else {
+        formatted = time.format("D MMM YY");
+      }
+    }
+  }
+
+  return formatted;
+}
+
+export function buildArrayString(array) {
+  const buffer = [];
+  array.forEach(v => {
+    if (v === null) {
+      buffer.push("null");
+    } else if (Object.prototype.toString.call(v) === "[object Array]") {
+      buffer.push(buildArrayString(v));
+    } else {
+      buffer.push(escapeHtml(v.toString()));
+    }
+  });
+  return "[" + buffer.join(", ") + "]";
+}
+
+export function buildHashString(hash, recurse) {
+  if (!hash) return "";
+
+  const buffer = [];
+  const hashes = [];
+  _.each(hash, (v, k) => {
+    if (v === null) {
+      buffer.push("null");
+    } else if (Object.prototype.toString.call(v) === "[object Array]") {
+      buffer.push(
+        "<tr><td>" +
+          escapeHtml(k) +
+          "</td><td>" +
+          buildArrayString(v) +
+          "</td></tr>"
+      );
+    } else if (typeof v === "object") {
+      hashes.push(k);
+    } else {
+      buffer.push(
+        "<tr><td>" + escapeHtml(k) + "</td><td>" + escapeHtml(v) + "</td></tr>"
+      );
+    }
+  });
+
+  if (_.size(hashes) > 0) {
+    _.each(hashes, function(k1) {
+      const v = hash[k1];
+      buffer.push("<tr><td></td><td><table>");
+      buffer.push(
+        "<td>" +
+          escapeHtml(k1) +
+          "</td><td>" +
+          buildHashString(v, true) +
+          "</td>"
+      );
+      buffer.push("</table></td></tr>");
+    });
+  }
+  const className = recurse ? "" : "env-table";
+  return "<table class='" + className + "'>" + buffer.join("\n") + "</table>";
+}