logster 0.8.4.3.pre → 0.8.4.4.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e704a239b3cbe88f36a41e30888836d981451494
-  data.tar.gz: ea74d3dfb8a7f2ffe9371194a4ab233c13133e0c
+  metadata.gz: 26758317e1dfa2cb38fd7932d7ffc2f9fd073c96
+  data.tar.gz: 58b3c563e7cb4232417b798bfcad902d3fe88621
 SHA512:
-  metadata.gz: 45bbecf6dc989a24d796eb5059588dfee399bded667c775b3183d48d5158f782ef6aa796fd83df0faea0631b72a923b1a8e92e1aecce33f15affab8112d78bf5
-  data.tar.gz: 715218740ee56fe89bc9b46174722a95d3f49b2545b894a608e2f92e56cb034227a117f6ba9b55826ecbdcb7f3385ca481766828ff6015711b68c2121abaacc3
+  metadata.gz: 47d950c4d8cf793f2d0999040c973bd5bf6d4a6c692135fe3ee549f79549e72c6a908f322ae2724eb4b55a99db2db797164d369371a9af917d20032952d275e0
+  data.tar.gz: dbbfee1e1e49871c6256def779f97f3675c74f0a0fccc0ff2f37ed930a8bc85274dd3a46ef3c7a240edec908f635c72a023ee996e965e8d26e39f52e29c8559f

data/assets/javascript/app.js

@@ -101,6 +101,10 @@ App.Message = Ember.Object.extend({
     this.set("expanded", true);
   },
 
+  "delete": function() {
+    return App.ajax("/message/" + this.get('key'), { type: "DELETE" });
+  },
+
   protect: function() {
     this.set('protected', true);
     return App.ajax("/protect/" + this.get('key'), { type: "PUT" });
@@ -181,6 +185,13 @@ App.MessageCollection = Em.Object.extend({
   currentMessage: null,
   total: 0,
 
+  "delete": function(message){
+    message.delete();
+    this.get('messages').removeObject(message);
+    this.set('currentMessage', null);
+    this.set('total', this.get('total')-1);
+  },
+
   load: function(opts) {
     var self = this;
     opts = opts || {};
@@ -372,6 +383,11 @@ App.IndexController = Em.Controller.extend({
         });
       }
     },
+
+    removeMessage: function(msg) {
+      var messages = this.get('model');
+      messages.delete(msg);
+    }
   },
 
   filterChanged: function(){
@@ -650,12 +666,18 @@ App.TabContentsComponent = Ember.Component.extend({
     this.invokeParent("removeTab");
   },
 
+});
+
+App.MessageInfoComponent = Ember.Component.extend({
   actions: {
     protect: function(){
       this.get('currentMessage').protect();
     },
     unprotect: function(){
       this.get('currentMessage').unprotect();
+    },
+    "remove": function(){
+      this.sendAction("removeMessage", this.get('currentMessage'));
     }
   }
 });

data/assets/javascript/components/message-info.hbs

@@ -25,4 +25,19 @@
       {{/tab-contents}}
     {{/if}}
   {{/tabbed-section}}
+
+  {{#if currentMessage}}
+    <div class='message-actions'>
+
+    {{#unless currentMessage.protected}}
+      <button {{action 'remove'}} class="delete btn"><i class='fa fa-trash-o'></i>Delete</button>
+
+      <button {{action 'protect'}} class="protect btn"><i class='fa fa-lock'></i>Protect</button>
+    {{else}}
+      <button {{action 'unprotect'}} class="unprotect btn"><i class='fa fa-unlock'></i>Unprotect</button>
+    {{/unless}}
+      <a href="{{currentMessage.shareUrl}}" class="share btn">Share</a>
+    </div>
+
+  {{/if}}
 </div>

data/assets/javascript/components/tab-contents.hbs

@@ -1,15 +1 @@
 {{yield}}
-{{#if currentMessage}}
-  <div class='message-actions'>
-
-  {{#unless currentMessage.protected}}
-    <i class='fa fa-lock'></i>
-    <a href {{action 'protect'}} class="protect">Protect</a>
-  {{else}}
-    <i class='fa fa-unlock'></i>
-    <a href {{action 'unprotect'}} class="protect">Unprotect</a>
-  {{/unless}}
-    <a href="{{currentMessage.shareUrl}}" class="share">Share</a>
-  </div>
-
-{{/if}}

data/assets/javascript/templates/index.hbs

@@ -23,7 +23,7 @@
 </div>
 {{panel-resizer}}
 <div id="bottom-panel">
-  {{message-info currentMessage=currentMessage}}
+  {{message-info currentMessage=currentMessage removeMessage="removeMessage"}}
 
   <div class="action-panel">
     <label class="debug">
@@ -52,6 +52,6 @@
     <label class="search">
       {{input type="textfield" placeholder="Search" value=search}}
     </label>
-    <a class="clear" href {{action "clear"}}>Clear logs</a>
+    <a class="clear btn danger" href {{action "clear"}}><i class='fa fa-trash-o'></i> Clear logs</a>
   </div>
 </div>

data/assets/stylesheets/app.css

@@ -145,15 +145,40 @@ tr.show-more {
   bottom: 10px;
 }
 
+#bottom-panel.full button.delete {
+  display: none;
+}
+
+#bottom-panel.full .message-actions {
+  position: fixed;
+  height: 40px;
+  width: 100%;
+  left: 0;
+  bottom: 0;
+  background-color: #eee;
+  border-top: 1px solid #dfdfdf;
+  padding-left: 10px;
+}
+
+#bottom-panel.full .message-actions button {
+  margin-top: 10px;
+}
+
+
+
 .message-actions {
-    position: fixed;
-    bottom: 45px;
-    right: 10px;
+    position: absolute;
+    bottom: 3px;
+    right: 30px;
 }
 
-.message-actions a {
-  z-index: 10000;
-  padding-right: 7px;
+.message-actions button {
+  margin-right: 7px;
+}
+
+.message-actions .share {
+  text-decoration: none;
+  color: #333;
 }
 
 .divider {
@@ -224,9 +249,8 @@ tr.show-more {
 }
 
 .action-panel .clear {
-  position: relative;
-  top: -1px;
-  margin-left: 50px;
+  position: absolute;
+  right: 30px;
   vertical-align: middle;
 }
 
@@ -306,3 +330,39 @@ tr.show-more {
   border-top: 1px solid #f1f1f1;
   background-color: #f1f1f1;
 }
+
+
+.btn {
+  display: inline-block;
+  margin: 0;
+  padding: 2px 12px;
+  font-weight: 500;
+  font-size: 1em;
+  line-height: 18px;
+  text-align: center;
+  cursor: pointer;
+  transition: all .25s;
+  background-color: #DDD;
+  text-decoration: none;
+  border: none;
+  color: #333;
+  font-weight: normal;
+}
+
+.btn:hover {
+  color: #000;
+  background-color: #ccc;
+}
+
+.btn .fa {
+  margin-right: 7px;
+}
+
+.btn:active {
+  text-shadow: none;
+}
+
+.btn.danger:hover {
+  background-color: #c63c1b;
+  color: #EEE;
+}

data/lib/logster/base_store.rb

@@ -50,6 +50,10 @@ module Logster
       not_implemented
     end
 
+    def delete(message_key)
+      not_implemented
+    end
+
     # Clear the protected mark for a message.
     def unprotect(message_key)
       not_implemented

data/lib/logster/message.rb

@@ -19,7 +19,7 @@ module Logster
       process_id
     }
 
-    attr_accessor :timestamp, :severity, :progname, :message, :key, :backtrace, :count, :env, :protected
+    attr_accessor :timestamp, :severity, :progname, :message, :key, :backtrace, :count, :env, :protected, :first_timestamp
 
     def initialize(severity, progname, message, timestamp = nil, key = nil)
       @timestamp = timestamp || get_timestamp
@@ -33,7 +33,7 @@ module Logster
     end
 
     def to_h
-      {
+      h = {
         message: @message,
         progname: @progname,
         severity: @severity,
@@ -44,6 +44,12 @@ module Logster
         env: @env,
         protected: @protected
       }
+
+      if @first_timestamp
+        h[:first_timestamp] = @first_timestamp
+      end
+
+      h
     end
 
     def to_json(opts = nil)
@@ -61,6 +67,7 @@ module Logster
       msg.env = parsed["env"]
       msg.count = parsed["count"]
       msg.protected = parsed["protected"]
+      msg.first_timestamp = parsed["first_timestamp"]
       msg
     end
 
@@ -90,6 +97,8 @@ module Logster
     end
 
     def merge_similar_message(other)
+      self.first_timestamp ||= self.timestamp
+      self.timestamp = [self.timestamp,other.timestamp].max
       other_env = JSON.load JSON.fast_generate other.env
       other_env.keys.each do |env_key|
         self.env[env_key] = Message.env_merge_helper(self.env[env_key], other_env[env_key])

data/lib/logster/middleware/viewer.rb

@@ -38,6 +38,20 @@ module Logster
           elsif resource.start_with?("/messages.json")
             serve_messages(Rack::Request.new(env))
 
+          elsif resource =~ /\/message\/([0-9a-f]+)$/
+            if env[REQUEST_METHOD] != "DELETE"
+              return [405, {}, ["GET not allowed for /clear"]]
+            end
+
+            key = $1
+            message = Logster.store.get(key)
+            unless message
+              return [404, {}, ["Message not found"]]
+            end
+
+            Logster.store.delete(message)
+            return [301, {"Location" => "#{@logs_path}/"}, []]
+
           elsif resource =~ /\/(un)?protect\/([0-9a-f]+)$/
             off = $1 == "un"
             key = $2

data/lib/logster/redis_store.rb

@@ -25,6 +25,14 @@ module Logster
       true
     end
 
+    def delete(msg)
+      @redis.multi do
+        @redis.hdel(hash_key, msg.key)
+        @redis.hdel(grouping_key, msg.grouping_key)
+        @redis.lrem(list_key, -1, msg.key)
+      end
+    end
+
     def replace_and_bump(message)
       # TODO make it atomic
       exists = @redis.hexists(hash_key, message.key)
@@ -130,9 +138,7 @@ module Logster
       json = @redis.hget(hash_key, message_key)
       return nil unless json
 
-      message = Message.from_json(json)
-      # message.protected = @redis.sismember(protected_key, message_key)
-      message
+      Message.from_json(json)
     end
 
     def protect(message_key)

data/lib/logster/version.rb

@@ -1,3 +1,3 @@
 module Logster
-  VERSION = "0.8.4.3.pre"
+  VERSION = "0.8.4.4.pre"
 end

data/test/logster/test_message.rb

@@ -1,6 +1,24 @@
 require_relative '../test_helper'
-require 'logster/redis_store'
+require 'logster/message'
 
 class TestMessage < MiniTest::Test
 
+  def test_merge_similar
+    msg1 = Logster::Message.new(0, '', 'test', 10)
+    msg1.populate_from_env(a: "1", b: "2")
+
+    msg2 = Logster::Message.new(0, '', 'test', 20)
+    msg2.populate_from_env(a: "2", c: "3")
+
+    assert_equal(msg2.grouping_key, msg1.grouping_key)
+
+    msg1.merge_similar_message(msg2)
+
+    msg1 = Logster::Message.from_json(msg1.to_json)
+
+    assert_equal(20, msg1.timestamp)
+    assert_equal(10, msg1.first_timestamp)
+
+  end
+
 end

data/test/logster/test_redis_store.rb

@@ -13,6 +13,14 @@ class TestRedisStore < Minitest::Test
     @store.clear_all
   end
 
+  def test_delete
+    msg = @store.report(Logger::WARN, "test", "testing")
+    @store.delete(msg)
+    latest = @store.latest
+
+    assert_equal(0,latest.length)
+  end
+
   def test_latest
     @store.report(Logger::WARN, "test", "IGNORE")
     @store.report(Logger::WARN, "test", "This is a warning")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logster
 version: !ruby/object:Gem::Version
-  version: 0.8.4.3.pre
+  version: 0.8.4.4.pre
 platform: ruby
 authors:
 - UI for viewing logs in Rack