logster 1.4.0.pre → 2.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 704e5f54b6fb95470fcf7389710c45e899f22ea7da2bcc65639fb79512d3e374
-  data.tar.gz: 673fd0c04c7e048dee1bf24025d9e2324a9c367a90bde080f49138d03cf45d4d
+  metadata.gz: 18cfb59f0fc2db337d3efc3b5d26b5ede5ac681cc599227b1564f500c17e5946
+  data.tar.gz: def563ba311997843ad3c30d8520e93d50b708f8d514ca180ad9fa20020a5ea6
 SHA512:
-  metadata.gz: 370a818a8bdddb495be4f4cf1aa2a3666d761ce28acc2e20b79a76c289acb3829f410b96078d6b5b0d70b813aada7a6242466a62c19d173b1ed42df14c84f1f0
-  data.tar.gz: 10fd9f0292116941dcbc0180ff0534895ea2b9688997840d24021bcb2aa88163f7947f66f9684c4ab78aef81a1bcfb77fab2f9a67c78b5432762425f81200a18
+  metadata.gz: 6351baad87ed818542d852e2b8c372231759cd508c8f5a6034e215ad585c3c9d81dc6d1865f0f343d6c5d39364efd1b10352abfa25c72a5099738d3525a6dc81
+  data.tar.gz: 8a81f0243db890dcb706c5bed34e286ebea5ed85132afcea112a7c3b12894997d1153bedeac7c44b7e44de7b29085730d945a610f2ff69cbc1b76f7b9a6dca2c

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .byebug_history
+.rubocop-https---raw-githubusercontent-com-discourse-discourse-master--rubocop-yml

data/.rubocop.yml

@@ -0,0 +1 @@
+inherit_from: https://raw.githubusercontent.com/discourse/discourse/master/.rubocop.yml

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # CHANGELOG
 
-- 2019-01-09: Version 1.4.0
+- 2019-01-17: Version 2.0.0.pre
+  - FIX: don't merge any new env samples if there are 50 samples (1.4.0.pre regression)
+  - UX: make env navigation controls stick to the top when scrolled
+  - PERF: store env samples separately from the rest of message data
+  - DEV: Rubocop
+
+- 2019-01-09: Version 1.4.0.pre
   - FEATURE: allow navigation through merged errors
   - FEATURE: search should look at env
   - FIX: deselect message if new filtering doesn't include selected message

data/assets/javascript/client-app.js

@@ -97,4 +97,4 @@ this.refreshInterval=setInterval(function(){a+=1
 var e=(0,n.isHidden)(),i=!e
 e&&a%s==0&&(i=!0,s<20&&s++),i&&(t.loadMore(),e||(s=1))},3e3),this.events.on("panelResized",function(t){e.resizePanels(t)})},deactivate:function(){clearInterval(this.refreshInterval)}})}),define("client-app/routes/show",["exports","client-app/models/message","client-app/lib/utilities"],function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.Route.extend({model:function(e){return(0,n.preloadOrAjax)("/show/"+e.id+".json")},setupController:function(e,n){this._super.apply(this,arguments),e.set("model",t.default.create(n))}})})
 define("client-app/services/ajax",["exports","ember-ajax/services/ajax"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}),define("client-app/templates/application",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.HTMLBars.template({id:"yOsrYpw5",block:'{"symbols":[],"statements":[[1,[21,"update-time"],false],[0,"\\n"],[1,[21,"outlet"],false],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"client-app/templates/application.hbs"}})}),define("client-app/templates/components/actions-menu",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.HTMLBars.template({id:"ebB3+Z4x",block:'{"symbols":["&default"],"statements":[[4,"if",[[23,["actionsInMenu"]]],null,{"statements":[[4,"if",[[23,["showMenu"]]],null,{"statements":[[0,"    "],[7,"div"],[11,"class","actions-menu"],[9],[0,"\\n      "],[14,1],[0,"\\n    "],[10],[0,"\\n"]],"parameters":[]},null],[0,"  "],[7,"button"],[11,"class","expand btn no-text"],[3,"action",[[22,0,[]],"expandMenu"]],[9],[7,"i"],[11,"class","fa fa-ellipsis-h"],[9],[10],[10],[0,"\\n  "],[7,"button"],[11,"class","share btn"],[3,"action",[[22,0,[]],"share"]],[9],[7,"i"],[11,"class","fa fa-share"],[9],[10],[7,"span"],[9],[0,"Share"],[10],[10],[0,"\\n"]],"parameters":[]},{"statements":[[0,"  "],[14,1],[0,"\\n  "],[7,"button"],[11,"class","share btn"],[3,"action",[[22,0,[]],"share"]],[9],[7,"i"],[11,"class","fa fa-share"],[9],[10],[7,"span"],[9],[0,"Share"],[10],[10],[0,"\\n"]],"parameters":[]}]],"hasEval":false}',meta:{moduleName:"client-app/templates/components/actions-menu.hbs"}})}),define("client-app/templates/components/env-tab",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.HTMLBars.template({id:"5078JpTW",block:'{"symbols":[],"statements":[[4,"if",[[23,["isEnvArray"]]],null,{"statements":[[0,"  "],[7,"div"],[11,"class","nav-controls"],[9],[0,"\\n    "],[7,"button"],[12,"disabled",[21,"disableBackButtons"]],[11,"class","btn nav-btn no-text"],[3,"action",[[22,0,[]],"bigJump","back"]],[9],[7,"i"],[11,"class","fa fa-fast-backward"],[9],[10],[10],[0,"\\n    "],[7,"button"],[12,"disabled",[21,"disableBackButtons"]],[11,"class","btn nav-btn no-text"],[3,"action",[[22,0,[]],"takeStep","back"]],[9],[7,"i"],[11,"class","fa fa-backward"],[9],[10],[10],[0,"\\n    "],[7,"span"],[11,"class","env-number"],[9],[1,[21,"current"],false],[0,"/"],[1,[23,["message","env","length"]],false],[10],[0,"\\n    "],[7,"button"],[12,"disabled",[21,"disableForwardButtons"]],[11,"class","btn nav-btn no-text"],[3,"action",[[22,0,[]],"takeStep","front"]],[9],[7,"i"],[11,"class","fa fa-forward"],[9],[10],[10],[0,"\\n    "],[7,"button"],[12,"disabled",[21,"disableForwardButtons"]],[11,"class","btn nav-btn no-text"],[3,"action",[[22,0,[]],"bigJump","front"]],[9],[7,"i"],[11,"class","fa fa-fast-forward"],[9],[10],[10],[0,"\\n  "],[10],[0,"\\n"]],"parameters":[]},null],[1,[21,"html"],true],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"client-app/templates/components/env-tab.hbs"}})}),define("client-app/templates/components/message-info",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.HTMLBars.template({id:"SK12lkYh",block:'{"symbols":["btn"],"statements":[[7,"div"],[11,"class","message-info"],[9],[0,"\\n"],[4,"tabbed-section",null,null,{"statements":[[4,"tab-contents",null,[["name","hint","currentMessage"],["info","show info",[23,["currentMessage"]]]],{"statements":[[4,"if",[[23,["showTitle"]]],null,{"statements":[[0,"        "],[7,"h3"],[9],[0,"Message\\n"],[4,"if",[[23,["currentMessage","showCount"]]],null,{"statements":[[0,"            ("],[1,[23,["currentMessage","count"]],false],[0," copies reported)\\n"]],"parameters":[]},null],[0,"        "],[10],[0,"\\n"]],"parameters":[]},null],[0,"      "],[7,"pre"],[9],[1,[23,["currentMessage","message"]],false],[10],[0,""]],"parameters":[]},null],[4,"tab-contents",null,[["name","defaultTab","hint","currentMessage"],["backtrace","true","show backtrace",[23,["currentMessage"]]]],{"statements":[[4,"if",[[23,["showTitle"]]],null,{"statements":[[0,"        "],[7,"h3"],[9],[0,"Backtrace"],[10],[0,"\\n"]],"parameters":[]},null],[0,"      "],[7,"pre"],[9],[1,[23,["currentMessage","backtrace"]],false],[10],[0,""]],"parameters":[]},null],[4,"if",[[23,["currentMessage","env"]]],null,{"statements":[[4,"tab-contents",null,[["className","name","hint","currentMessage"],["env","env","show environment",[23,["currentMessage"]]]],{"statements":[[4,"if",[[23,["showTitle"]]],null,{"statements":[[0,"          "],[7,"h3"],[9],[0,"Env"],[10],[0,"\\n"]],"parameters":[]},null],[0,"        "],[1,[27,"env-tab",null,[["message"],[[23,["currentMessage"]]]]],false],[0,"\\n"]],"parameters":[]},null]],"parameters":[]},null]],"parameters":[]},null],[0,"\\n"],[4,"if",[[23,["currentMessage"]]],null,{"statements":[[0,"    "],[7,"div"],[11,"class","message-actions"],[9],[0,"\\n"],[4,"actions-menu",null,[["actionsInMenu","share"],[[23,["actionsInMenu"]],[27,"action",[[22,0,[]],"share"],null]]],{"statements":[[4,"each",[[23,["buttons"]]],null,{"statements":[[0,"          "],[7,"button"],[12,"class",[28,[[22,1,["klass"]]," btn ",[27,"if",[[22,1,["danger"]],"danger",""],null]]]],[3,"action",[[22,0,[]],[22,1,["action"]]]],[9],[0,"\\n            "],[7,"i"],[12,"class",[28,["fa fa-",[22,1,["icon"]]]]],[9],[10],[0,"\\n            "],[7,"span"],[9],[1,[22,1,["label"]],false],[10],[0,"\\n          "],[10],[0,"\\n"]],"parameters":[1]},null]],"parameters":[]},null],[0,"    "],[10],[0,"\\n"]],"parameters":[]},null],[10],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"client-app/templates/components/message-info.hbs"}})}),define("client-app/templates/components/message-row",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.HTMLBars.template({id:"pF0hQ9a+",block:'{"symbols":[],"statements":[[7,"div"],[11,"class","count"],[9],[0,"\\n"],[4,"if",[[23,["model","showCount"]]],null,{"statements":[[0,"    "],[1,[23,["model","count"]],false],[0,"\\n"]],"parameters":[]},null],[10],[0,"\\n"],[7,"div"],[11,"class","severity"],[9],[1,[23,["model","glyph"]],true],[10],[0,"\\n"],[7,"div"],[11,"class","message-body"],[9],[0,"\\n  "],[1,[23,["model","displayMessage"]],false],[0,"\\n"],[10],[0,"\\n"],[7,"div"],[11,"class","protected"],[9],[0,"\\n"],[4,"if",[[23,["model","protected"]]],null,{"statements":[[0,"    "],[7,"i"],[11,"title","message is protected, clearing will not remove it"],[11,"class","fa fa-lock"],[9],[10],[0,"\\n"]],"parameters":[]},null],[10],[0,"\\n"],[7,"div"],[11,"class","time"],[9],[1,[27,"time-formatter",null,[["timestamp"],[[23,["model","timestamp"]]]]],false],[10],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"client-app/templates/components/message-row.hbs"}})}),define("client-app/templates/components/panel-resizer",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.HTMLBars.template({id:"FLUzT7ST",block:'{"symbols":[],"statements":[[7,"div"],[11,"class","line-1"],[9],[10],[0,"\\n"],[7,"div"],[11,"class","line-2"],[9],[10],[0,"\\n"],[7,"div"],[11,"class","line-3"],[9],[10],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"client-app/templates/components/panel-resizer.hbs"}})}),define("client-app/templates/components/tabbed-section",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.HTMLBars.template({id:"nreTgL17",block:'{"symbols":["tab","&default"],"statements":[[14,2],[0,"\\n"],[7,"ul"],[11,"class","tabs"],[9],[0,"\\n"],[4,"each",[[23,["tabs"]]],null,{"statements":[[0,"    "],[7,"li"],[9],[0,"\\n      "],[7,"a"],[12,"title",[28,[[27,"unbound",[[22,1,["hint"]]],null]]]],[11,"href","#"],[12,"class",[28,[[27,"if",[[22,1,["active"]],"active"],null]]]],[3,"action",[[22,0,[]],[23,["selectTab"]],[22,1,[]]]],[9],[0,"\\n        "],[1,[27,"unbound",[[22,1,["name"]]],null],false],[0,"\\n      "],[10],[0,"\\n    "],[10],[0,"\\n"]],"parameters":[1]},null],[10],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"client-app/templates/components/tabbed-section.hbs"}})}),define("client-app/templates/components/time-formatter",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.HTMLBars.template({id:"sp53cTcH",block:'{"symbols":[],"statements":[[1,[21,"time"],false],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"client-app/templates/components/time-formatter.hbs"}})}),define("client-app/templates/index",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.HTMLBars.template({id:"whComJMa",block:'{"symbols":["message"],"statements":[[7,"div"],[11,"id","top-panel"],[9],[0,"\\n  "],[7,"div"],[11,"id","log-table"],[9],[0,"\\n"],[4,"if",[[23,["model","moreBefore"]]],null,{"statements":[[0,"      "],[7,"div"],[11,"class","show-more"],[3,"action",[[22,0,[]],"showMoreBefore"]],[9],[0,"\\n"],[4,"if",[[23,["model","hideCountInLoadMore"]]],null,{"statements":[[0,"          Load more\\n"]],"parameters":[]},{"statements":[[0,"          Select to see "],[1,[23,["model","totalBefore"]],false],[0," more\\n"]],"parameters":[]}],[0,"      "],[10],[0,"\\n"]],"parameters":[]},null],[4,"each",[[23,["model","messages"]]],null,{"statements":[[0,"      "],[1,[27,"message-row",null,[["model","selectedMessage"],[[22,1,[]],[27,"action",[[22,0,[]],"selectMessage"],null]]]],false],[0,"\\n"]],"parameters":[1]},null],[0,"  "],[10],[0,"\\n"],[10],[0,"\\n"],[7,"div"],[11,"id","bottom-panel"],[9],[0,"\\n  "],[1,[27,"message-info",null,[["currentMessage","removeMessage","solveMessage","actionsInMenu"],[[23,["currentMessage"]],[27,"action",[[22,0,[]],"removeMessage"],null],[27,"action",[[22,0,[]],"solveMessage"],null],[23,["actionsInMenu"]]]]],false],[0,"\\n\\n  "],[7,"div"],[11,"class","action-panel"],[9],[0,"\\n    "],[7,"div"],[11,"class","severity-filters"],[9],[0,"\\n    "],[7,"div"],[11,"class","more-wrapping"],[9],[0,"\\n      "],[7,"label"],[11,"class","debug"],[9],[0,"\\n        "],[1,[27,"input",null,[["type","checked"],["checkbox",[23,["showDebug"]]]]],false],[0,"\\n        "],[7,"span"],[9],[0,"Debug"],[10],[0,"\\n      "],[10],[0,"\\n      "],[7,"label"],[11,"class","info"],[9],[0,"\\n        "],[1,[27,"input",null,[["type","checked"],["checkbox",[23,["showInfo"]]]]],false],[0,"\\n        "],[7,"span"],[9],[0,"Info"],[10],[0,"\\n      "],[10],[0,"\\n      "],[7,"label"],[11,"class","warn"],[9],[0,"\\n        "],[1,[27,"input",null,[["type","checked"],["checkbox",[23,["showWarn"]]]]],false],[0,"\\n        "],[7,"i"],[11,"class","fa fa-exclamation-circle warning"],[9],[10],[0,"\\n        "],[7,"span"],[9],[0,"Warning"],[10],[0,"\\n      "],[10],[0,"\\n      "],[7,"label"],[11,"class","error"],[9],[0,"\\n        "],[1,[27,"input",null,[["type","checked"],["checkbox",[23,["showErr"]]]]],false],[0,"\\n        "],[7,"i"],[11,"class","fa fa-times-circle error"],[9],[10],[0,"\\n        "],[7,"span"],[9],[0,"Error"],[10],[0,"\\n      "],[10],[0,"\\n      "],[7,"label"],[11,"class","fatal"],[9],[0,"\\n        "],[1,[27,"input",null,[["type","checked"],["checkbox",[23,["showFatal"]]]]],false],[0,"\\n        "],[7,"i"],[11,"class","fa fa-times-circle fatal"],[9],[10],[0,"\\n        "],[7,"span"],[9],[0,"Fatal"],[10],[0,"\\n      "],[10],[0,"\\n    "],[10],[0,"\\n    "],[10],[0,"\\n    "],[7,"div"],[11,"class","search-clear-all"],[9],[0,"\\n      "],[1,[27,"input",null,[["type","class","placeholder","value"],["textfield","search","Search",[23,["search"]]]]],false],[0,"\\n      "],[7,"button"],[11,"class","clear btn danger"],[3,"action",[[22,0,[]],"clear"]],[9],[7,"i"],[11,"class","fa fa-times"],[9],[10],[7,"span"],[9],[0,"Clear logs"],[10],[10],[0,"\\n    "],[10],[0,"\\n  "],[10],[0,"\\n"],[10],[0,"\\n"],[1,[21,"panel-resizer"],false],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"client-app/templates/index.hbs"}})}),define("client-app/templates/show",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.HTMLBars.template({id:"V916vpg9",block:'{"symbols":[],"statements":[[4,"link-to",["index"],null,{"statements":[[0,"Recent"]],"parameters":[]},null],[0,"\\n"],[7,"div"],[11,"id","bottom-panel"],[11,"class","full"],[9],[0,"\\n  "],[1,[27,"message-info",null,[["currentMessage","showTitle","actionsInMenu"],[[23,["model"]],"true",false]]],false],[0,"\\n"],[10],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"client-app/templates/show.hbs"}})}),define("client-app/config/environment",[],function(){try{var e="client-app/config/environment",t=document.querySelector('meta[name="'+e+'"]').getAttribute("content"),n={default:JSON.parse(unescape(t))}
-return Object.defineProperty(n,"__esModule",{value:!0}),n}catch(a){throw new Error('Could not read config from meta tag with name "'+e+'".')}}),runningTests||require("client-app/app").default.create({name:"client-app",version:"0.0.0+9e5a1fad"})
+return Object.defineProperty(n,"__esModule",{value:!0}),n}catch(a){throw new Error('Could not read config from meta tag with name "'+e+'".')}}),runningTests||require("client-app/app").default.create({name:"client-app",version:"0.0.0+8710f335"})

data/assets/stylesheets/client-app.css

@@ -1 +1 @@
-.divider,.message-info{border-bottom:1px solid #ddd}body{font-family:Roboto,Arial,"Liberation Sans","DejaVu Sans",sans-serif;font-size:12px}body.mobile,body.mobile .message{font-size:14px}pre{font-family:"Roboto Mono",Consolas,Monaco,Ubuntu Mono,monospace}table.env-table tbody tr td{border-top:none;line-height:18px;vertical-align:top}table.env-table,table.env-table table{border-spacing:0;border-collapse:collapse}table.env-table td{padding-right:5px}tbody tr{width:98%}.message-row{display:flex}.message-row .protected,.message-row .severity{text-align:center;width:25px;flex-grow:0;flex-shrink:0;font-size:12px}.message-row div{border-top:.5px #e9e9e9 solid;padding-top:1px;padding-bottom:1px;line-height:25px}.message-row .count{width:30px;flex-grow:0;flex-shrink:0;padding-right:4px;box-sizing:border-box;font-size:11px;font-weight:700;text-align:right}.message-row .message-body{flex-grow:1;flex-shrink:1;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-size:13px}.message-row .time{flex-grow:0;flex-shrink:0;color:#999;vertical-align:top;font-size:12px;padding-right:8px}.action-panel .clear,.action-panel .search,.action-panel i.fa,.btn .fa,.btn span,input,label span{vertical-align:middle}.message-row:hover{background-color:#f8f8f8;cursor:pointer}.message-row.selected{background-color:#dfdfdf}i.fatal{color:#e00}i.error{color:#900}i.warning{color:#feb800}.debug{color:#777}.btn,.tabs a{text-decoration:none;color:#333}.action-panel .search{border:1px solid #ddd;padding:3px;box-sizing:border-box}#log-table .show-more{text-align:center;height:30px;line-height:30px;text-decoration:none;background-color:#ddd;cursor:pointer;margin-top:8px}#overlay,.divider{cursor:row-resize}#bottom-panel{position:fixed;bottom:0;left:0;right:0;height:300px;background-color:#f1f1f1;padding:0 8px 8px;z-index:2}#bottom-panel.full{position:static;background-color:inherit;height:90%}#bottom-panel.full>div{padding-bottom:40px}#bottom-panel.full .tabs{display:none}#bottom-panel.full .message-info{position:static}#bottom-panel.full .message-info .content{display:block;position:static}#bottom-panel.full button.delete,.hidden{display:none}#bottom-panel.full .save,#bottom-panel.full .share{bottom:10px}#bottom-panel.full .message-actions button{margin-top:8px}#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}.divider,.tabs{border-top:1px solid #ddd}.message-actions{position:absolute;bottom:5px;right:0;margin-right:10px}.message-actions button{margin-left:5px}.divider{position:fixed;bottom:310px;left:0;right:0;height:15px;background-color:#fafafa}.divider div{margin:auto;width:24px;height:1px;background-color:#ccc;position:relative}.divider .line-1{top:5px}.divider .line-2{top:6px}.divider .line-3{top:7px}#top-panel{position:fixed;top:0;left:0;right:0;bottom:320px;overflow:auto}.action-panel,.message-info{position:absolute;left:0;right:0}.message-info{top:0}.action-panel{bottom:0;font-weight:700}.action-panel input{margin:0}.severity-filters label{margin-right:18px}.action-panel .clear{float:right}#log-table{margin:auto;width:99%}.message-info .env-table,.message-info pre{position:relative;margin:10px}#overlay{position:fixed;z-index:99999;top:0;bottom:0;left:0;right:0;opacity:0}.message-info .content,.tabs{position:absolute;left:0;right:0}.message-info .content{top:0;bottom:35px;overflow:auto;display:none}.message-info .content.active{display:block}.tabs{bottom:13px;list-style-type:none;margin:0 0 5px;padding:0 0 0 10px}.tabs a,.tabs li{position:relative}.tabs li{float:left;padding-right:5px;margin:0}.tabs a{top:6px;border:1px solid #ddd;border-top:none;border-bottom-left-radius:5px;border-bottom-right-radius:5px;padding:6px;background-color:#e1e1e1}.tabs a.active{border-top:1px solid #f1f1f1;background-color:#f1f1f1}.btn{display:inline-block;margin:0;padding:5px 12px;font-size:1em;line-height:0;text-align:center;cursor:pointer;transition:all .25s;background-color:#ddd;border:none;font-weight:400}.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}.search-clear-all .clear,.search-clear-all .search{height:24px}.search-clear-all .clear,.search-clear-all .search,.severity-filters label{align-self:center}.search-clear-all .clear{margin-left:auto}@media (min-width:701px){.search-clear-all,.severity-filters{height:100%}.more-wrapping,.search-clear-all,.severity-filters{display:flex}.severity-filters{float:left}.action-panel{padding:10px;box-sizing:border-box;height:42px}.message-info{bottom:42px}}@media (max-width:700px){.severity-filters{padding:10px}.search-clear-all{padding:0 10px 10px}.action-panel{height:69px}.message-info{bottom:69px}}@media (max-width:415px){.severity-filters{overflow-x:scroll;overflow-y:hidden;white-space:nowrap}.more-wrapping:after,.more-wrapping:before{content:"";position:absolute;height:18px}.more-wrapping:before{width:15px;margin-left:-10px;background:linear-gradient(to right,#f1f1f1 0,rgba(241,241,241,.001) 100%)}.more-wrapping:after{right:0;width:23px;background:linear-gradient(to left,#f1f1f1 0,rgba(241,241,241,.001) 100%)}}.btn.no-text .fa{margin:0}.btn[disabled]{opacity:.5}.actions-menu{position:absolute;background:#fafafa;display:inline-flex;flex-direction:column;bottom:27px;right:45px;width:115px;padding:5px 5px 0;box-shadow:0 4px 14px rgba(0,0,0,.15)}.actions-menu button{margin:0 0 5px;height:27px}.nav-controls{margin:10px}.env-number{margin:0 7px}
+.divider,.message-info{border-bottom:1px solid #ddd}body{font-family:Roboto,Arial,"Liberation Sans","DejaVu Sans",sans-serif;font-size:12px}body.mobile,body.mobile .message{font-size:14px}pre{font-family:"Roboto Mono",Consolas,Monaco,Ubuntu Mono,monospace}table.env-table tbody tr td{border-top:none;line-height:18px;vertical-align:top}table.env-table,table.env-table table{border-spacing:0;border-collapse:collapse}table.env-table td{padding-right:5px}tbody tr{width:98%}.message-row{display:flex}.message-row .protected,.message-row .severity{text-align:center;width:25px;flex-grow:0;flex-shrink:0;font-size:12px}.message-row div{border-top:.5px #e9e9e9 solid;padding-top:1px;padding-bottom:1px;line-height:25px}.message-row .count{width:30px;flex-grow:0;flex-shrink:0;padding-right:4px;box-sizing:border-box;font-size:11px;font-weight:700;text-align:right}.message-row .message-body{flex-grow:1;flex-shrink:1;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-size:13px}.message-row .time{flex-grow:0;flex-shrink:0;color:#999;vertical-align:top;font-size:12px;padding-right:8px}.action-panel .clear,.action-panel .search,.action-panel i.fa,.btn .fa,.btn span,input,label span{vertical-align:middle}.message-row:hover{background-color:#f8f8f8;cursor:pointer}.message-row.selected{background-color:#dfdfdf}i.fatal{color:#e00}i.error{color:#900}i.warning{color:#feb800}.debug{color:#777}.btn,.tabs a{text-decoration:none;color:#333}.action-panel .search{border:1px solid #ddd;padding:3px;box-sizing:border-box}#log-table .show-more{text-align:center;height:30px;line-height:30px;text-decoration:none;background-color:#ddd;cursor:pointer;margin-top:8px}#overlay,.divider{cursor:row-resize}#bottom-panel{position:fixed;bottom:0;left:0;right:0;height:300px;background-color:#f1f1f1;padding:0 8px 8px;z-index:2}#bottom-panel.full{position:static;background-color:inherit;height:90%}#bottom-panel.full>div{padding-bottom:40px}#bottom-panel.full .tabs{display:none}#bottom-panel.full .message-info{position:static}#bottom-panel.full .message-info .content{display:block;position:static}#bottom-panel.full button.delete,.hidden{display:none}#bottom-panel.full .save,#bottom-panel.full .share{bottom:10px}#bottom-panel.full .message-actions button{margin-top:8px}#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}.divider,.tabs{border-top:1px solid #ddd}.message-actions{position:absolute;bottom:5px;right:0;margin-right:10px}.message-actions button{margin-left:5px}.divider{position:fixed;bottom:310px;left:0;right:0;height:15px;background-color:#fafafa}.divider div{margin:auto;width:24px;height:1px;background-color:#ccc;position:relative}.divider .line-1{top:5px}.divider .line-2{top:6px}.divider .line-3{top:7px}#top-panel{position:fixed;top:0;left:0;right:0;bottom:320px;overflow:auto}.action-panel,.message-info{position:absolute;left:0;right:0}.message-info{top:0}.action-panel{bottom:0;font-weight:700}.action-panel input{margin:0}.severity-filters label{margin-right:18px}.action-panel .clear{float:right}#log-table{margin:auto;width:99%}.message-info .env-table,.message-info pre{position:relative;margin:5px 10px 10px}#overlay{position:fixed;z-index:99999;top:0;bottom:0;left:0;right:0;opacity:0}.message-info .content,.tabs{position:absolute;left:0;right:0}.message-info .content{top:0;bottom:35px;overflow:auto;display:none}.message-info .content.active{display:block}.tabs{bottom:13px;list-style-type:none;margin:0 0 5px;padding:0 0 0 10px}.tabs a,.tabs li{position:relative}.tabs li{float:left;padding-right:5px;margin:0}.tabs a{top:6px;border:1px solid #ddd;border-top:none;border-bottom-left-radius:5px;border-bottom-right-radius:5px;padding:6px;background-color:#e1e1e1}.tabs a.active{border-top:1px solid #f1f1f1;background-color:#f1f1f1}.btn{display:inline-block;margin:0;padding:5px 12px;font-size:1em;line-height:0;text-align:center;cursor:pointer;transition:all .25s;background-color:#ddd;border:none;font-weight:400}.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}.search-clear-all .clear,.search-clear-all .search{height:24px}.search-clear-all .clear,.search-clear-all .search,.severity-filters label{align-self:center}.search-clear-all .clear{margin-left:auto}@media (min-width:701px){.search-clear-all,.severity-filters{height:100%}.more-wrapping,.search-clear-all,.severity-filters{display:flex}.severity-filters{float:left}.action-panel{padding:10px;box-sizing:border-box;height:42px}.message-info{bottom:42px}}@media (max-width:700px){.severity-filters{padding:10px}.search-clear-all{padding:0 10px 10px}.action-panel{height:69px}.message-info{bottom:69px}}@media (max-width:415px){.severity-filters{overflow-x:scroll;overflow-y:hidden;white-space:nowrap}.more-wrapping:after,.more-wrapping:before{content:"";position:absolute;height:18px}.more-wrapping:before{width:15px;margin-left:-10px;background:linear-gradient(to right,#f1f1f1 0,rgba(241,241,241,.001) 100%)}.more-wrapping:after{right:0;width:23px;background:linear-gradient(to left,#f1f1f1 0,rgba(241,241,241,.001) 100%)}}.btn.no-text .fa{margin:0}.btn[disabled]{opacity:.5}.actions-menu{position:absolute;background:#fafafa;display:inline-flex;flex-direction:column;bottom:27px;right:45px;width:115px;padding:5px 5px 0;box-shadow:0 4px 14px rgba(0,0,0,.15);z-index:3}.actions-menu button{margin:0 0 5px;height:27px}.nav-controls{padding:10px}#bottom-panel:not(.full) .nav-controls{position:sticky;top:0;background:#f1f1f1;z-index:1;border-bottom:1px solid #ddd}.env-number{margin:0 7px}

data/client-app/app/styles/app.css

@@ -289,6 +289,7 @@ label span {
 .message-info .env-table {
   position: relative;
   margin: 10px;
+  margin-top: 5px;
 }
 
 #overlay {
@@ -490,6 +491,7 @@ label span {
   padding: 5px;
   padding-bottom: 0px;
   box-shadow: 0 4px 14px rgba(0, 0, 0, 0.15);
+  z-index: 3;
 }
 
 .actions-menu button {
@@ -498,7 +500,15 @@ label span {
 }
 
 .nav-controls {
-  margin: 10px 10px;
+  padding: 10px;
+}
+
+#bottom-panel:not(.full) .nav-controls {
+  position: sticky;
+  top: 0;
+  background: #f1f1f1;
+  z-index: 1;
+  border-bottom: 1px solid #ddd;
 }
 
 .env-number {

data/lib/examples/sidekiq_logster_reporter.rb

@@ -1,5 +1,5 @@
 class SidekiqLogsterReporter
-  def call(ex, context={})
+  def call(ex, context = {})
     # Pass context to Logster
     fake_env = {}
     context.each do |key, value|

data/lib/logster.rb

@@ -21,7 +21,7 @@ module Logster
   end
 
   def self.store=(store)
-    @store=store
+    @store = store
   end
 
   def self.store

data/lib/logster/base_store.rb

@@ -14,7 +14,7 @@ module Logster
     end
 
     # Modify the saved message to the given one (identified by message.key) and bump it to the top of the latest list
-    def replace_and_bump(message)
+    def replace_and_bump(message, save_env: true)
       not_implemented
     end
 
@@ -40,7 +40,17 @@ module Logster
     end
 
     # Get a message by its message_key
-    def get(message_key)
+    def get(message_key, load_env: true)
+      not_implemented
+    end
+
+    # Get a group of messages by their message_keys
+    def bulk_get(message_keys)
+      not_implemented
+    end
+
+    # Get a message's env by its message_key
+    def get_env(message_key)
       not_implemented
     end
 
@@ -98,19 +108,23 @@ module Logster
         message.backtrace = caller.join("\n")
       end
 
-      return if ignore && ignore.any? { |pattern| message =~ pattern}
+      return if ignore && ignore.any? { |pattern| message =~ pattern }
 
       similar = nil
 
       if Logster.config.allow_grouping
         key = self.similar_key(message)
-        similar = get key if key
+        similar = get(key, load_env: false) if key
       end
 
       if similar
-        similar.merge_similar_message(message)
+        has_env = !similar.env.nil? && !similar.env.empty?
+        if similar.count < Logster::MAX_GROUPING_LENGTH && !has_env
+          similar.env = get_env(similar.key) || {}
+        end
+        save_env = similar.merge_similar_message(message)
 
-        replace_and_bump similar
+        replace_and_bump(similar, save_env: save_env || has_env)
         similar
       else
         save message

data/lib/logster/configuration.rb

@@ -7,7 +7,7 @@ module Logster
 
     def initialize
       # lambda |env,block|
-      @current_context = lambda{ |_, &block| block.call }
+      @current_context = lambda { |_, &block| block.call }
       @environments = [:development, :production]
       @subdirectory = nil
 

data/lib/logster/ignore_pattern.rb

@@ -1,13 +1,13 @@
 module Logster
   class IgnorePattern
 
-    def initialize(message_pattern=nil, env_patterns=nil)
+    def initialize(message_pattern = nil, env_patterns = nil)
       @msg_match = message_pattern
       @env_match = env_patterns
     end
 
     def self.from_message_and_request_uri(msg, request)
-      IgnorePattern.new(msg, {REQUEST_URI: request})
+      IgnorePattern.new(msg, REQUEST_URI: request)
     end
 
     def matches?(message)
@@ -32,18 +32,18 @@ module Logster
       return false unless message && pattern
 
       case pattern
-        when Regexp
-          message.to_s =~ pattern
-        when String
-          message.to_s =~ Regexp.new(pattern, Regexp::IGNORECASE)
-        when Hash
-          if Hash === message
-            compare_hash(message, pattern)
-          else
-            false
-          end
+      when Regexp
+        message.to_s =~ pattern
+      when String
+        message.to_s =~ Regexp.new(pattern, Regexp::IGNORECASE)
+      when Hash
+        if Hash === message
+          compare_hash(message, pattern)
         else
           false
+        end
+        else
+        false
       end
     end
 

data/lib/logster/logger.rb

@@ -31,7 +31,7 @@ module Logster
       @chained << logger
     end
 
-    def add_to_chained(logger, severity, message, progname, opts=nil, &block)
+    def add_to_chained(logger, severity, message, progname, opts = nil, &block)
       if logger.respond_to? :skip_store
         old = logger.skip_store
         logger.skip_store = @skip_store
@@ -49,7 +49,7 @@ module Logster
     end
 
     def add(*args, &block)
-      add_with_opts(*args,&block)
+      add_with_opts(*args, &block)
     end
 
     def level
@@ -57,7 +57,7 @@ module Logster
       (ol && ol[Thread.current.object_id]) || @level
     end
 
-    def add_with_opts(severity, message, progname=progname(), opts=nil, &block)
+    def add_with_opts(severity, message, progname = progname(), opts = nil, &block)
       if severity < level
         return true
       end

data/lib/logster/message.rb

@@ -35,7 +35,7 @@ module Logster
       @first_timestamp = nil
     end
 
-    def to_h
+    def to_h(exclude_env: false)
       h = {
         message: @message,
         progname: @progname,
@@ -44,28 +44,27 @@ module Logster
         key: @key,
         backtrace: @backtrace,
         count: @count,
-        env: @env,
         protected: @protected
       }
 
-      if @first_timestamp
-        h[:first_timestamp] = @first_timestamp
-      end
+      h[:first_timestamp] = @first_timestamp if @first_timestamp
+      h[:env] = @env unless exclude_env
 
       h
     end
 
     def to_json(opts = nil)
-      JSON.fast_generate(to_h, opts)
+      exclude_env = Hash === opts && opts.delete(:exclude_env)
+      JSON.fast_generate(to_h(exclude_env: exclude_env), opts)
     end
 
     def self.from_json(json)
       parsed = ::JSON.parse(json)
-      msg = new( parsed["severity"],
+      msg = new(parsed["severity"],
             parsed["progname"],
             parsed["message"],
             parsed["timestamp"],
-            parsed["key"] )
+            parsed["key"])
       msg.backtrace = parsed["backtrace"]
       msg.env = parsed["env"]
       msg.count = parsed["count"]
@@ -132,8 +131,10 @@ module Logster
 
     def merge_similar_message(other)
       self.first_timestamp ||= self.timestamp
-      self.timestamp = [self.timestamp,other.timestamp].max
+      self.timestamp = [self.timestamp, other.timestamp].max
+
       self.count += other.count || 1
+      return false if self.count > Logster::MAX_GROUPING_LENGTH
 
       other_env = JSON.load JSON.fast_generate other.env
       if Array === self.env
@@ -141,6 +142,7 @@ module Logster
       else
         Array === other_env ? self.env = [self.env, *other_env] : self.env = [self.env, other_env]
       end
+      true
     end
 
     def self.populate_from_env(env)
@@ -162,7 +164,7 @@ module Logster
         scrubbed = default_env
         request = Rack::Request.new(env)
         params = {}
-        request.params.each do |k,v|
+        request.params.each do |k, v|
           if k.include? "password"
             params[k] = "[redacted]"
           elsif Array === v
@@ -172,8 +174,8 @@ module Logster
           end
         end
         scrubbed["params"] = params if params.length > 0
-        ALLOWED_ENV.map{ |k|
-         scrubbed[k] = env[k] if env[k]
+        ALLOWED_ENV.map { |k|
+          scrubbed[k] = env[k] if env[k]
         }
         scrubbed
       end
@@ -188,16 +190,16 @@ module Logster
 
     def =~(pattern)
       case pattern
-        when Hash
-          IgnorePattern.new(nil, pattern).matches? self
-        when String
-          IgnorePattern.new(pattern, nil).matches? self
-        when Regexp
-          IgnorePattern.new(pattern, nil).matches? self
-        when IgnorePattern
-          pattern.matches? self
+      when Hash
+        IgnorePattern.new(nil, pattern).matches? self
+      when String
+        IgnorePattern.new(pattern, nil).matches? self
+      when Regexp
+        IgnorePattern.new(pattern, nil).matches? self
+      when IgnorePattern
+        pattern.matches? self
         else
-          nil
+        nil
       end
     end
 
@@ -206,48 +208,5 @@ module Logster
     def get_timestamp
       (Time.new.to_f * 1000).to_i
     end
-
-    private
-
-    def self.env_merge_helper(self_value, other_value)
-      other_value = other_value.to_s if Symbol === other_value
-
-      if (Hash === self_value || self_value.nil?) && (Hash === other_value || other_value.nil?) && (!self_value.nil? || !other_value.nil?)
-        # one or both is a hash but not neither -> recurse on the keys
-        self_value = {} unless self_value
-        other_value = {} unless other_value
-        shared_keys = self_value.keys | (other_value.keys rescue [])
-        shared_keys.each do |key|
-          self_value[key] = env_merge_helper(self_value[key], other_value[key])
-        end
-        self_value
-      elsif self_value.is_a?(Array) && !other_value.is_a?(Array)
-        # Already have grouped data, so append to array (it's actually a set)
-        self_value << other_value unless self_value.include?(other_value) || self_value.length >= Logster::MAX_GROUPING_LENGTH
-        self_value
-      elsif !self_value.is_a?(Array)
-        if self_value == other_value
-          self_value
-        else
-          [self_value, other_value]
-        end
-      else
-        # They're both arrays.
-        # Three cases:
-        # self = [1,2,3] and other = [1,2,4] -> make into array of array
-        # self = [] and other = [1,2,4] -> make into array of array
-        # self = [[1,2,3], [1,2,5]] and other = [1,2,4] -> append to array
-        if self_value.length > 0 && self_value[0].is_a?(Array)
-          self_value << other_value unless self_value.include?(other_value) || self_value.length >= Logster::MAX_GROUPING_LENGTH
-          self_value
-        else
-          if self_value == other_value
-            self_value
-          else
-            [self_value, other_value]
-          end
-        end
-      end
-    end
   end
 end

data/lib/logster/middleware/reporter.rb

@@ -5,7 +5,7 @@ module Logster
       PATH_INFO = "PATH_INFO".freeze
       SCRIPT_NAME = "SCRIPT_NAME".freeze
 
-      def initialize(app, config={})
+      def initialize(app, config = {})
         @app = app
         @error_path = Logster.config.subdirectory + '/report_js_error'
       end
@@ -13,7 +13,6 @@ module Logster
       def call(env)
         Thread.current[Logster::Logger::LOGSTER_ENV] = env
 
-
         path = env[PATH_INFO]
         script_name = env[SCRIPT_NAME]
 
@@ -25,7 +24,7 @@ module Logster
           Logster.config.current_context.call(env) do
             report_js_error(env)
           end
-          return [200,{},["OK"]]
+          return [200, {}, ["OK"]]
         end
 
         @app.call(env)

data/lib/logster/middleware/viewer.rb

@@ -13,7 +13,7 @@ module Logster
 
         @logs_path = Logster.config.subdirectory
         @path_regex = Regexp.new("^(#{@logs_path}$)|^(#{@logs_path}(/.*))$")
-        @store = Logster.store or raise ArgumentError.new("store")
+        (@store = Logster.store) || raise(ArgumentError.new("store"))
 
         @assets_path = File.expand_path("../../../../assets", __FILE__)
         @fileserver = Rack::File.new(@assets_path)
@@ -46,7 +46,7 @@ module Logster
             end
 
             Logster.store.delete(message)
-            return [301, {"Location" => "#{@logs_path}/"}, []]
+            return [301, { "Location" => "#{@logs_path}/" }, []]
 
           elsif resource =~ /\/(un)?protect\/([0-9a-f]+)$/
             off = $1 == "un"
@@ -59,13 +59,13 @@ module Logster
 
             if off
               if Logster.store.unprotect(key)
-                return [301, {"Location" => "#{@logs_path}/show/#{key}?protected=false"}, []]
+                return [301, { "Location" => "#{@logs_path}/show/#{key}?protected=false" }, []]
               else
                 return [500, {}, ["Failed"]]
               end
             else
               if Logster.store.protect(key)
-                return [301, {"Location" => "#{@logs_path}/show/#{key}?protected=true"}, []]
+                return [301, { "Location" => "#{@logs_path}/show/#{key}?protected=true" }, []]
               else
                 return [500, {}, ["Failed"]]
               end
@@ -81,7 +81,7 @@ module Logster
 
             Logster.store.solve(key)
 
-            return [301, {"Location" => "#{@logs_path}"}, []]
+            return [301, { "Location" => "#{@logs_path}" }, []]
 
           elsif resource =~ /\/clear$/
             if env[REQUEST_METHOD] != "POST"
@@ -100,14 +100,14 @@ module Logster
             end
 
             if json
-              [200, {"Content-Type" => "application/json; charset=utf-8"}, [message.to_json]]
+              [200, { "Content-Type" => "application/json; charset=utf-8" }, [message.to_json]]
             else
-              preload = preload_json({"/show/#{key}" => message})
-              [200, {"Content-Type" => "text/html; charset=utf-8"}, [body(preload)]]
+              preload = preload_json("/show/#{key}" => message)
+              [200, { "Content-Type" => "text/html; charset=utf-8" }, [body(preload)]]
             end
 
           elsif resource == "/"
-            [200, {"Content-Type" => "text/html; charset=utf-8"}, [body(preload_json)]]
+            [200, { "Content-Type" => "text/html; charset=utf-8" }, [body(preload_json)]]
 
           else
             [404, {}, ["Not found"]]
@@ -134,8 +134,8 @@ module Logster
           after: params["after"]
         }
 
-        if(filter = params["filter"])
-          filter = filter.split("_").map{|s| s.to_i}
+        if (filter = params["filter"])
+          filter = filter.split("_").map { |s| s.to_i }
           opts[:severity] = filter
         end
 
@@ -152,7 +152,7 @@ module Logster
         }
 
         json = JSON.generate(payload)
-        [200, {"Content-Type" => "application/json"}, [json]]
+        [200, { "Content-Type" => "application/json" }, [json]]
       end
 
       def parse_regex(string)
@@ -169,20 +169,20 @@ module Logster
         end
       end
 
-      def preload_json(extra={})
+      def preload_json(extra = {})
         values = {}
         values.merge!(extra)
       end
 
-      def css(name, attrs={})
-        attrs = attrs.map do |k,v|
+      def css(name, attrs = {})
+        attrs = attrs.map do |k, v|
           "#{k}='#{v}'"
         end.join(" ")
 
         "<link rel='stylesheet' type='text/css' href='#{@logs_path}/stylesheets/#{name}' #{attrs}>"
       end
 
-      def script(prod, dev=nil)
+      def script(prod, dev = nil)
         name = ENV['DEBUG_JS'] == "1" && dev ? dev : prod
         "<script src='#{@logs_path}/javascript/#{name}'></script>"
       end