From 862a7d876db59f899e5a394b0228168161d22601 Mon Sep 17 00:00:00 2001 From: Calvin Montgomery Date: Sat, 31 May 2014 22:13:53 -0700 Subject: [PATCH] Fix #372 --- lib/channel/channel.js | 4 ++-- lib/channel/playlist.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/channel/channel.js b/lib/channel/channel.js index 5a3f0b42..3d46d86d 100644 --- a/lib/channel/channel.js +++ b/lib/channel/channel.js @@ -559,10 +559,10 @@ Channel.prototype.readLog = function (shouldMaskIP, cb) { read.on("end", function () { if (shouldMaskIP) { buffer = buffer.replace( - /^(\d+\.\d+\.\d+)\.\d+/g, + /(?:^|\s)(\d+\.\d+\.\d+)\.\d+/g, "$1.x" ).replace( - /^((?:[0-9a-f]+:){3}[0-9a-f]+):(?:[0-9a-f]+:){3}[0-9a-f]+$/, + /(?:^|\s)((?:[0-9a-f]+:){3}[0-9a-f]+):(?:[0-9a-f]+:){3}[0-9a-f]+$/, "$1:x:x:x:x" ); } diff --git a/lib/channel/playlist.js b/lib/channel/playlist.js index 1c952963..e555fe34 100644 --- a/lib/channel/playlist.js +++ b/lib/channel/playlist.js @@ -15,7 +15,7 @@ const TYPE_QUEUE = { id: "string,boolean", type: "string", pos: "string", - title: "string,optional", + title: "string,boolean,optional", duration: "number,optional", temp: "boolean,optional" };