scales-monitor 0.0.1.beta.2 → 0.0.4

data/lib/scales-monitor/app/app/assets/javascripts/app/controllers/log.jst.coffee

@@ -7,6 +7,7 @@ class App.Log extends Spine.Controller
     super
     @render()
     @bindEvents()
+    @changed = false
     setInterval => 
       @eventsDiv.animate({ scrollTop: @eventsDiv[0].scrollHeight }, 500)
     , 1000
@@ -55,4 +56,5 @@ class App.Log extends Spine.Controller
       else
         out += "<br/>&nbsp;&nbsp;&nbsp; -> #{item} = #{data}"
       
-    @eventsDiv.append out
+    @eventsDiv.append out
+    @changed = true

data/lib/scales-monitor/app/app/assets/javascripts/app/controllers/resources.js.coffee

@@ -8,10 +8,20 @@ class App.Resources extends Spine.Controller
   constructor: ->
     super
     [@resources, @partials, @servers] = [{}, {}, {}]
+    [@resourcesChanged, @partialsChanged] = [false, false]
     @colors = {}
     @bindColors()
     @render()
     @bindEvents()
+    setInterval => 
+      if @resourcesChanged
+        @resourcesChanged = false
+        @renderResources(@resources, @resourcesDiv)
+      
+      if @partialsChanged
+        @partialsChanged = false
+        @renderResources(@partials, @partialsDiv)
+    , 200
   
   activate: ->
     @el.addClass("active")
@@ -40,27 +50,27 @@ class App.Resources extends Spine.Controller
     
     Spine.bind 'push_resource', (resource) =>
       @resources[resource.path] = resource
-      @renderResources(@resources, @resourcesDiv)
+      @resourcesChanged = true
     
     Spine.bind 'destroy_resource', (resource) =>
       delete @resources[resource.path]
-      @renderResources(@resources, @resourcesDiv)
+      @resourcesChanged = true
     
     Spine.bind 'push_partial', (partial) =>
       @partials[partial.path] = partial
-      @renderResources(@partials, @partialsDiv)
+      @partialsChanged = true
 
     Spine.bind 'destroy_partial', (partial) =>
       delete @partials[partial.path]
-      @renderResources(@partials, @partialsDiv)
+      @partialsChanged = true
     
     Spine.bind 'server_started', (server) =>
       @servers[server.id] = server
-      @renderResources(@resources, @resourcesDiv)
+      @resourcesChanged = true
 
     Spine.bind 'server_stopped', (server) =>
       delete @servers[server.id]
-      @renderResources(@resources, @resourcesDiv)
+      @resourcesChanged = true
   
   render: ->
     @html JST['app/views/resources'](@)
@@ -91,6 +101,7 @@ class App.Resources extends Spine.Controller
     div.html out
     div.tooltip({ selector: "a" })
     @renderContentTypes()
+    
   
   processContentTypes: ->
     formats = {}

data/lib/scales-monitor/app/app/assets/javascripts/app/views/resources.jst.eco

@@ -23,7 +23,9 @@
   
   <div class="span4">
     <div class="page-header"><h1>Content Types</h1></div>
-    <div id="content_types"></div>
+    <div id="content_types">
+      <div class="well dark-grey pagination-centered"><h2 class="white">0</h2></div>
+    </div>
   </div>
   
 </div>

data/lib/scales-monitor/app/public/assets/application.js

@@ -4469,6 +4469,7 @@ replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
         Log.__super__.constructor.apply(this, arguments);
         this.render();
         this.bindEvents();
+        this.changed = false;
         setInterval(function() {
           return _this.eventsDiv.animate({
             scrollTop: _this.eventsDiv[0].scrollHeight
@@ -4549,7 +4550,8 @@ replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
             out += "<br/>&nbsp;&nbsp;&nbsp; -> " + item + " = " + data;
           }
         }
-        return this.eventsDiv.append(out);
+        this.eventsDiv.append(out);
+        return this.changed = true;
       };
   
       return Log;
@@ -4746,13 +4748,25 @@ replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
     };
 
     function Resources() {
-      var _ref;
+      var _ref, _ref1,
+        _this = this;
       Resources.__super__.constructor.apply(this, arguments);
       _ref = [{}, {}, {}], this.resources = _ref[0], this.partials = _ref[1], this.servers = _ref[2];
+      _ref1 = [false, false], this.resourcesChanged = _ref1[0], this.partialsChanged = _ref1[1];
       this.colors = {};
       this.bindColors();
       this.render();
       this.bindEvents();
+      setInterval(function() {
+        if (_this.resourcesChanged) {
+          _this.resourcesChanged = false;
+          _this.renderResources(_this.resources, _this.resourcesDiv);
+        }
+        if (_this.partialsChanged) {
+          _this.partialsChanged = false;
+          return _this.renderResources(_this.partials, _this.partialsDiv);
+        }
+      }, 200);
     }
 
     Resources.prototype.activate = function() {
@@ -4786,27 +4800,27 @@ replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
       var _this = this;
       Spine.bind('push_resource', function(resource) {
         _this.resources[resource.path] = resource;
-        return _this.renderResources(_this.resources, _this.resourcesDiv);
+        return _this.resourcesChanged = true;
       });
       Spine.bind('destroy_resource', function(resource) {
         delete _this.resources[resource.path];
-        return _this.renderResources(_this.resources, _this.resourcesDiv);
+        return _this.resourcesChanged = true;
       });
       Spine.bind('push_partial', function(partial) {
         _this.partials[partial.path] = partial;
-        return _this.renderResources(_this.partials, _this.partialsDiv);
+        return _this.partialsChanged = true;
       });
       Spine.bind('destroy_partial', function(partial) {
         delete _this.partials[partial.path];
-        return _this.renderResources(_this.partials, _this.partialsDiv);
+        return _this.partialsChanged = true;
       });
       Spine.bind('server_started', function(server) {
         _this.servers[server.id] = server;
-        return _this.renderResources(_this.resources, _this.resourcesDiv);
+        return _this.resourcesChanged = true;
       });
       return Spine.bind('server_stopped', function(server) {
         delete _this.servers[server.id];
-        return _this.renderResources(_this.resources, _this.resourcesDiv);
+        return _this.resourcesChanged = true;
       });
     };
 
@@ -5486,7 +5500,7 @@ replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
     (function() {
       (function() {
       
-        __out.push('<header class="jumbotron subhead">\n  <h1>Resources</h1>\n  <p class="lead">Overview of all Resources, the Partials and Content Types</p>\n</header>\n\n<section>\n\n<div class="row">\n  \n  <div class="span4">\n    <div class="page-header"><h1>Resources</h1></div>\n    <div id="resources">\n      <div class="well dark-grey pagination-centered"><h2 class="white">0</h2></div>\n    </div>\n  </div>\n  \n  <div class="span4">\n    <div class="page-header"><h1>Partials</h1></div>\n    <div id="partials">\n      <div class="well dark-grey pagination-centered"><h2 class="white">0</h2></div>\n    </div>\n  </div>\n  \n  <div class="span4">\n    <div class="page-header"><h1>Content Types</h1></div>\n    <div id="content_types"></div>\n  </div>\n  \n</div>\n\n</section>\n');
+        __out.push('<header class="jumbotron subhead">\n  <h1>Resources</h1>\n  <p class="lead">Overview of all Resources, the Partials and Content Types</p>\n</header>\n\n<section>\n\n<div class="row">\n  \n  <div class="span4">\n    <div class="page-header"><h1>Resources</h1></div>\n    <div id="resources">\n      <div class="well dark-grey pagination-centered"><h2 class="white">0</h2></div>\n    </div>\n  </div>\n  \n  <div class="span4">\n    <div class="page-header"><h1>Partials</h1></div>\n    <div id="partials">\n      <div class="well dark-grey pagination-centered"><h2 class="white">0</h2></div>\n    </div>\n  </div>\n  \n  <div class="span4">\n    <div class="page-header"><h1>Content Types</h1></div>\n    <div id="content_types">\n      <div class="well dark-grey pagination-centered"><h2 class="white">0</h2></div>\n    </div>\n  </div>\n  \n</div>\n\n</section>\n');
       
       }).call(this);
       

data/lib/scales-monitor/version.rb

@@ -1,5 +1,5 @@
 module Scales
   module Monitor
-    VERSION = "0.0.1.beta.2"
+    VERSION = "0.0.4"
   end
 end

data/lib/scales-monitor/web_socket.rb

@@ -6,7 +6,7 @@ module Scales
       
       def on_open(env)
         send_initial_statuses(env)
-        setup_subscription
+        setup_subscription!
         add_to_subscribers(env)
       end
 
@@ -15,7 +15,6 @@ module Scales
       end
 
       def on_message(env, msg)
-        env.stream_send(msg)
       end
 
       def on_close(env)
@@ -34,7 +33,7 @@ module Scales
       
       private
       
-      def setup_subscription
+      def setup_subscription!
         return if @subscribed
         @subscribers = []
         
@@ -43,6 +42,7 @@ module Scales
         events.on(:message) do |channel, message|
           @subscribers.each { |subscriber| subscriber.stream_send(message) }
         end
+        
         @subscribed = true
       end
       
@@ -60,7 +60,6 @@ module Scales
         worker_statuses.each{ |worker| env.stream_send(worker)    }
         
         request_queue.each{  |request| env.stream_send(request)   }
-        response_queue.each{ |request| env.stream_send(response)  }
         
         push_resources.each{ |resource| env.stream_send(resource) }
         push_partials.each{  |partial|  env.stream_send(partial)  }
@@ -95,11 +94,11 @@ module Scales
       end
       
       def request_queue
-        requests = Storage::Async.connection.llen("scales_request_queue")
+        requests = Storage::Async.connection.llen(Scales::Storage::REQUEST_QUEUE)
         return [] if requests == 0
         
         data = []
-        Storage::Async.connection.lrange("scales_request_queue", 0, requests).each do |request|
+        Storage::Async.connection.lrange(Scales::Storage::REQUEST_QUEUE, 0, requests).each do |request|
           job = JSON.parse(request)
           data << {
             :id         => job['scales.id'],
@@ -112,26 +111,6 @@ module Scales
         data
       end
       
-      def response_queue
-        responses = Storage::Async.connection.keys("scales_response_*")
-        return [] if responses.empty?
-        
-        data = []
-        responses.each do |response_key|
-          response = Storage::Async.connection.lindex(response_key, 0)
-          response = JSON.parse(response)
-          data << {
-            :id         => response[1]['scales.id'],
-            :worker_id  => nil,
-            :type       => "worker_put_response_in_queue",
-            :path       => response[1]['PATH_INFO'],
-            :method     => response[1]['REQUEST_METHOD'],
-            :status     => response[0]
-          }.to_json
-        end
-        data
-      end
-      
       def push_resources
         resources = Storage::Async.connection.keys("scales_resource_/*")
         return [] if resources.empty?

data/spec/web_socket_spec.rb

@@ -51,8 +51,8 @@ describe Scales::Monitor::WebSocket do
     it "sends requests" do
       with_api(described_class, {:verbose => true, :log_stdout => true}) do |server|
         json = "{\"scales.id\":\"4f57fcec795b6a6158796a1958e781f0\",\"SERVER_NAME\":\"0.0.0.0\",\"SERVER_PORT\":\"3005\",\"REQUEST_METHOD\":\"POST\",\"QUERY_STRING\":\"\",\"PATH_INFO\":\"/tracks\",\"HTTP_HOST\":\"0.0.0.0:3005\",\"HTTP_USER_AGENT\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_4) AppleWebKit/536.19 (KHTML, like Gecko) Version/6.0 Safari/536.19\",\"HTTP_ACCEPT\":\"text/html, application/xhtml+xml, application/xml;q=0.9, */*;q=0.8\",\"HTTP_ORIGIN\":\"http://0.0.0.0:3005\",\"HTTP_REFERER\":\"http://0.0.0.0:3005/tracks/new\",\"HTTP_ACCEPT_LANGUAGE\":\"en-us\",\"HTTP_ACCEPT_ENCODING\":\"gzip, deflate\",\"HTTP_CONNECTION\":\"keep-alive\",\"HTTP_VERSION\":\"1.1\",\"rack.version\":[1,0],\"rack.url_scheme\":null,\"rack.input\":\"utf8=%E2%9C%93&authenticity_token=gniWYAZpl67rSI0VYfrpoBXJ3Ipv9ZEv9VY9FSbyoDM%3D&track%5Bname%5D=Next+one&track%5Bartist%5D=Okay+here&commit=Create+Track\"}"
-        Scales::Storage::Async.connection.lpush("scales_request_queue", json)
-        Scales::Storage::Async.connection.lpush("scales_request_queue", json)
+        Scales::Storage::Async.connection.lpush(Scales::Storage::REQUEST_QUEUE, json)
+        Scales::Storage::Async.connection.lpush(Scales::Storage::REQUEST_QUEUE, json)
 
         requests = described_class.new.instance_eval{ request_queue }
         requests.should have_at_least(2).requests
@@ -60,18 +60,6 @@ describe Scales::Monitor::WebSocket do
       end
     end
     
-    it "sends responds" do
-      with_api(described_class, {:verbose => true, :log_stdout => true}) do |server|
-        json = "[302,{\"Location\":\"http://0.0.0.0:3005/tracks/170\",\"Content-Type\":\"text/html; charset=utf-8\",\"Set-Cookie\":\"_app_session=BAh7B0kiCmZsYXNoBjoGRUZvOiVBY3Rpb25EaXNwYXRjaDo6Rmxhc2g6OkZsYXNoSGFzaAk6CkB1c2VkbzoIU2V0BjoKQGhhc2h7ADoMQGNsb3NlZEY6DUBmbGFzaGVzewY6C25vdGljZUkiJFRyYWNrIHdhcyBzdWNjZXNzZnVsbHkgY3JlYXRlZC4GOwBGOglAbm93MEkiD3Nlc3Npb25faWQGOwBGSSIlZDkxNDA4OTFmMWVhZTJlNGU2MmM3MmRkOTA4NDZjODUGOwBU--fd4912d39bd51eedcd5bf0519a939e5b38317b34; path=/; HttpOnly\",\"scales.id\":\"155a255dd3604fa2e39469e30aef3206\"},\"<html><body>You are being <a href=\\\"http://0.0.0.0:3005/tracks/170\\\">redirected</a>.</body></html>\"]"
-        Scales::Storage::Async.connection.lpush("scales_response_155a255dd3604fa2e39469e30aef3206", json)
-        Scales::Storage::Async.connection.lpush("scales_response_155a255dd3604fa2e39469e30aef3207", json)
-
-        responses = described_class.new.instance_eval{ response_queue }
-        responses.should have_at_least(2).responses
-        EM.stop
-      end
-    end
-    
     it "sends push resources" do
       with_api(described_class, {:verbose => true, :log_stdout => true}) do |server|
         Scales::Storage::Async.flushall!      

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: scales-monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta.2
-  prerelease: 6
+  version: 0.0.4
+  prerelease: 
 platform: ruby
 authors:
 - Thomas Fankhauser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70329462937160 !ruby/object:Gem::Requirement
+  requirement: &70344757710880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70329462937160
+  version_requirements: *70344757710880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70329462935500 !ruby/object:Gem::Requirement
+  requirement: &70344757710380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,32 +32,32 @@ dependencies:
         version: '2.11'
   type: :runtime
   prerelease: false
-  version_requirements: *70329462935500
+  version_requirements: *70344757710380
 - !ruby/object:Gem::Dependency
   name: scales-core
-  requirement: &70329462956040 !ruby/object:Gem::Requirement
+  requirement: &70344757709940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.0.1.beta.2
+        version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70329462956040
+  version_requirements: *70344757709940
 - !ruby/object:Gem::Dependency
   name: scales-server
-  requirement: &70329462954720 !ruby/object:Gem::Requirement
+  requirement: &70344757709460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.0.1.beta.2
+        version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70329462954720
+  version_requirements: *70344757709460
 - !ruby/object:Gem::Dependency
   name: goliath
-  requirement: &70329462953120 !ruby/object:Gem::Requirement
+  requirement: &70344757709000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 1.0.0.beta.1
   type: :runtime
   prerelease: false
-  version_requirements: *70329462953120
+  version_requirements: *70344757709000
 description: Super Scale Caching Framework - Monitor Server
 email:
 - tommylefunk@googlemail.com
@@ -157,9 +157,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11