logstash-lite 0.2.20101124030048 → 0.2.20101129155412

data/lib/logstash/filters/date.rb

@@ -49,8 +49,8 @@ class LogStash::Filters::Date < LogStash::Filters::Base
             end
             event.timestamp = LogStash::Time.to_iso8601(time)
             @logger.debug "Parsed #{value.inspect} as #{event.timestamp}"
-          rescue
-            @logger.warn "Failed parsing date #{value.inspect} from field #{field} with format #{format.inspect}: #{$!}"
+          rescue => e
+            @logger.warn "Failed parsing date #{value.inspect} from field #{field} with format #{format.inspect}: #{e}"
           end
         end # fieldvalue.each 
       end # if this event has a field we expect to be a timestamp

data/lib/logstash/outputs/websocket.rb

@@ -11,9 +11,11 @@ class LogStash::Outputs::Websocket < LogStash::Outputs::Base
     @subscribers = 0
     host = (@url.host or "0.0.0.0")
     port = (@url.port or 3000)
+    @logger.info("Registering websocket on #{@url}")
     EventMachine::WebSocket.start(:host => host, :port => port) do |ws|
       ws.onopen do
         @subscribers += 1
+        @logger.info("New #{self.class.name} connection")
         sid = @channel.subscribe do |msg| 
           ws.send msg
         end
@@ -29,6 +31,7 @@ class LogStash::Outputs::Websocket < LogStash::Outputs::Base
     # Only publish the event to websockets if there are subscribers
     # TODO(sissel): send a patch to eventmachine to fix this.
     if @subscribers > 0
+      @logger.info("Sending event to websocket.")
       @channel.push event.to_json
     end
   end # def event

data/lib/logstash/time.rb

@@ -1,4 +1,5 @@
 require "logstash/namespace"
+require "date" # for DateTime
 
 # Provide our own Time wrapper for ISO8601 support
 # Example:

data/lib/logstash/web/public/ws/index.html

@@ -45,19 +45,20 @@
 
     <script id="message-template" type="text/x-jquery-tmpl"><![CDATA[
       <tr>
-          <td class="timestamp">${received_timestamp}</td>
-          <td class="message">${message}</td>
+          <td class="timestamp">${$item.data["@timestamp"]}</td>
+          <td class="message">${$item.data["@message"]}</td>
       </tr>
     ]]></script>
 
     <script>
       $(document).ready(function() {
-        var ws = new WebSocket("ws://snack.home:3000");
+        var ws = new WebSocket("ws://" + document.location.hostname + ":3232");
+        ws.onopen = function(event) {
+          //console.log(["WebSocket open", ws])
+        };
         ws.onmessage = function(event) {
           eval("var data = " + event.data);
-          //var el = $("<div></div>")
-          //el.html(data.message)
-          var el = $("#message-template").tmpl(data);
+          var el = $("#message-template").tmpl(data, { "message": data["@message"], "timestamp": data["@timestamp"] });
           el.addClass("message")
             .css("display", "none")
             .appendTo($("#radiator"))
@@ -66,7 +67,7 @@
             .fadeOut(2000, function() {
               $(this).remove();
             });
-        }
+        };
       });
     </script>
   </body>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logstash-lite
 version: !ruby/object:Gem::Version 
-  hash: 40202248060119
+  hash: 40202258310847
   prerelease: false
   segments: 
   - 0
   - 2
-  - 20101124030048
-  version: 0.2.20101124030048
+  - 20101129155412
+  version: 0.2.20101129155412
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 -08:00
+date: 2010-11-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency