mouth 0.8.0 → 0.8.1

data/.gitignore

@@ -4,4 +4,4 @@
 log/*.log
 log/*.pid
 Gemfile.lock
-
+*.gem

data/Capfile

@@ -17,6 +17,7 @@ task :omg do
     loc = "#{home}/#{file}"
     upload file, loc
     sudo "gem install #{loc}"
+    run "rm #{loc}"
     run "mouth-endoscope -K"
     run "mouth --pidfile #{home}/mouth.pid -K"
     run "sleep 5"

data/TODO

@@ -1,14 +1,17 @@
+Now
+ - Build a caching system so that ticks don't pull in old data
+
 Next
  - Cookie-ize the timespan settings
  - Re implement graph autoplacement
  - Better backend impl of source list
- - Figure out how dashboards can scroll
  - Show period averages / rates
  - Full keyboard navigation
  - Build in some mechanisms to diagnose mongo connection issues
  - Auto refreshing source list (every minute?)
  - More Tests
  - Figure out time zones
+ - replicaset connection for endoscope
 
 Someday
  - Picker:
@@ -29,4 +32,4 @@ Bugs:
  - tooltip spawns multiple copies on large datasets
 
 Refactorings:
- - reconcile naming of 'sources' sometimes being array of strings and sometimes array of objects
+ - reconcile naming of 'sources' sometimes being array of strings and sometimes array of objects

data/bin/mouth

@@ -16,6 +16,7 @@ options = {
 parser = OptionParser.new do |op|
   op.banner = "Usage: mouth [options]"
 
+  op.separator "Mouth version: #{Mouth::VERSION}"
   op.separator ""
   op.separator "Options:"
 

data/bin/mouth-endoscope

@@ -12,7 +12,11 @@ rescue LoadError
 end 
 
 Vegas::Runner.new(Mouth::Endoscope, 'mouth-endoscope') do |runner, opts, app|
-  opts.on("--mongohost HOSTPORT", "STORE SUCKINGS IN THIS MONGO") do |mongo_host|
+  opts.on("--mongohost HOST", "STORE SUCKINGS IN THIS MONGO HOST") do |mongo_host|
     Mouth.mongo_host = mongo_host
   end
+  
+  opts.on("--mongoport PORT", "STORE SUCKINGS IN THIS MONGO PORT") do |mongo_port|
+    Mouth.mongo_port = mongo_port
+  end
 end

data/lib/mouth.rb

@@ -5,12 +5,13 @@ module Mouth
   class << self
     attr_accessor :logger
     attr_accessor :mongo_host
+    attr_accessor :mongo_port
 
     # Returns a mongo connection (NOT an em-mongo connection)
     def mongo
       @mongo ||= begin
         require 'mongo'   # require mongo here, as opposed to the top, because we don't want mongo included in the reactor (use em-mongo for that)
-        Mongo::Connection.new(self.mongo_host || "localhost").db("mouth")
+        Mongo::Connection.new(self.mongo_host || "localhost", self.mongo_port || 27017, :pool_size => 5, :pool_timeout => 20).db("mouth")
       end
     end
     

data/lib/mouth/endoscope/public/application.js

@@ -336,6 +336,7 @@ var DashboardPane = Backbone.View.extend({
     this.dashboardList.bind('current_change', this.onCurrentChange);
     
     this.model = null;
+    this.graphViews = [];
     
     this.elGrid= this.$('#grid');
     this.elAddGraph = this.$('.add-graph');
@@ -350,22 +351,28 @@ var DashboardPane = Backbone.View.extend({
   onCurrentChange: function(model) {
     var self = this;
     
+    _.each(self.graphViews, function(gv) {
+      gv.destroy();
+    });
+    self.graphViews = [];
+    
     // Clean up
     if (self.model) {
       self.model.graphs.unbind('add', self.onAddGraph);
-      self.elGrid.empty();
+      //self.elGrid.empty();
     }
     
     self.model = model;
     model.graphs.each(function(m) {
       self.onAddGraph(m);
-    })
+    });
     self.render();
     model.graphs.bind('add', self.onAddGraph);
   },
   
   onAddGraph: function(m) {
     var graphView = new GraphView({model: m});
+    this.graphViews.push(graphView);
     this.elGrid.append(graphView.render().el);
   },
   
@@ -406,7 +413,7 @@ var GraphView = Backbone.View.extend({
   },
   
   initialize: function(opts) {
-    _.bindAll(this, 'render', 'onDragStop', 'onClickEdit', 'onClickPick', 'onCreateModel', 'onClickDelete', 'onRemoveModel', 'onPick', 'onCancelPick', 'onDateRangeChanged', 'onTick');
+    _.bindAll(this, 'render', 'onDragStop', 'onClickEdit', 'onClickPick', 'onCreateModel', 'onClickDelete', 'onRemoveModel', 'onPick', 'onCancelPick', 'onDateRangeChanged', 'onTick', 'destroy');
     
     this.mode = 'front';
     this.model = opts.model;
@@ -418,6 +425,13 @@ var GraphView = Backbone.View.extend({
     $(document.body).bind('date_range_changed', this.onDateRangeChanged);
   },
   
+  destroy: function() {
+    this.model.unbind('change:id', this.onCreateModel);
+    this.model.unbind('remove', this.onRemoveModel);
+    this.model.unbind('tick', this.onTick);
+    $(this.el).remove();
+  },
+  
   render: function() {
     var el = $(this.el)
     ,   m = this.model

data/lib/mouth/sequence.rb

@@ -79,7 +79,21 @@ module Mouth
       ###
       map_function = <<-JS
         function() {
-          emit(Math.floor((this.t - #{start_timestamp}) / #{minutes}), this);
+          var doc = {t: this.t, m: {}, c: {}}
+          ,   thisMetrics = this.#{self.kind_letter.to_s}
+          ,   docMetrics = doc.#{self.kind_letter.to_s}
+          ,   fields = #{self.metrics.to_s}
+          ,   i, k, val
+          ;
+          
+          for (i = 0; i < fields.length; i += 1) {
+            val = thisMetrics[fields[i]];
+            if (typeof val != "undefined") {
+              docMetrics[fields[i]] = val;
+            }
+          }
+          
+          emit(Math.floor((this.t - #{start_timestamp}) / #{minutes}), doc);
         }
       JS
   

data/lib/mouth/sucker.rb

@@ -75,9 +75,11 @@ module Mouth
     # timer: glork:320|ms
     # (future) gauge: gaugor:333|g
     def store!(data)
-      key_value, command_sampling = data.split("|", 2)
+      key_value, command_sampling = data.to_s.split("|", 2)
       key, value = key_value.to_s.split(":")
-      command, sampling = command_sampling.split("|")
+      command, sampling = command_sampling.to_s.split("|")
+      
+      return unless key && value && command && key.length > 0 && value.length > 0 && command.length > 0
       
       key = Mouth.parse_key(key).join(".")
       value = value.to_f

data/lib/mouth/version.rb

@@ -1,3 +1,3 @@
 module Mouth
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/test/sucker_test.rb

@@ -39,6 +39,19 @@ class SuckerTest < Test::Unit::TestCase
     assert_equal ({"default.happening" => 3}), r.counters.values.first
   end
   
+  def test_storing_invalid
+    r = Mouth::Sucker.new
+    
+    r.store!("stuff")
+    r.store!("stuff:3")
+    r.store!("stuff|c")
+    r.store!("")
+    r.store!("3|c")
+    r.store!("stuff:3|p")
+    
+    assert_equal nil, r.counters.values.first
+  end
+  
   def test_storing_timer
     r = Mouth::Sucker.new
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mouth
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000Z
+date: 2012-05-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-mongo
-  requirement: &70094097164760 !ruby/object:Gem::Requirement
+  requirement: &70245756341200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70094097164760
+  version_requirements: *70245756341200
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70094097164260 !ruby/object:Gem::Requirement
+  requirement: &70245756340700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70094097164260
+  version_requirements: *70245756340700
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70094097163800 !ruby/object:Gem::Requirement
+  requirement: &70245756340240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70094097163800
+  version_requirements: *70245756340240
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70094097163340 !ruby/object:Gem::Requirement
+  requirement: &70245756339780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *70094097163340
+  version_requirements: *70245756339780
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70094097162880 !ruby/object:Gem::Requirement
+  requirement: &70245756339320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.8
   type: :runtime
   prerelease: false
-  version_requirements: *70094097162880
+  version_requirements: *70245756339320
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70094097162420 !ruby/object:Gem::Requirement
+  requirement: &70245756338860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70094097162420
+  version_requirements: *70245756338860
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70094097161960 !ruby/object:Gem::Requirement
+  requirement: &70245756338400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70094097161960
+  version_requirements: *70245756338400
 description: Ruby Daemon collects statistics via UDP packets, stores them in Mongo,
   and then views them via a user friendly Sintra app.
 email: jnovak@gmail.com