nutella_framework 0.4.24 → 0.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0720891b6fb93a176284ef82ac26de713f0655cf
-  data.tar.gz: b4e577f28c3d2d424ea2a9a95fc9731dbb533138
+  metadata.gz: cf6e988b17c348fcf123bd5c4fddb50dbd91705f
+  data.tar.gz: 9546373c3e5ceba6fda814436cd1139c37de172a
 SHA512:
-  metadata.gz: 95496a8fd67c0d26475321f7c728c07e6a747079f8ac808bdb1733ccfd16c308c700da9368c75dc4b16dc66d926214e4522e97baef23022ca3a4c85e36d8045a
-  data.tar.gz: 069d2b6fabb4a65a56c97c7d6767ec185635ba6ec8a4f78587f3a92ecd51b4feabb196f74ef54c9ae8b574bd646480540430d71818def73de25e5222b0122fc3
+  metadata.gz: 81ef6f0abcb01d61defacf202b90c3cadd05b84f9b86b833a078a2abbbb4b5e84fdeb2e0d18205d7cb2b3e7feca80f951a1931a9b83fb00ee6872193ea72c04a
+  data.tar.gz: df0c4ecabc02d44e67acb0dd8cdae1c1048a756faa11a016950ade3e154590c1cc263f99148e0c6dd5c95ab8f55b4271c6d93f24f10ddcdf2866f0fbd0cf9914

data/Gemfile

@@ -11,6 +11,7 @@ gem 'slop', '~>4.0'
 gem 'nutella_lib','~>0.4', '>=0.4.12'
 gem 'activesupport', '~>4.2'
 gem 'mandrill-api', '~>1.0', '>=1.0.53'
+gem 'bson', '~> 3.0'
 
 group :development do
   gem 'shoulda', '~> 3.0'

data/VERSION

@@ -1 +1 @@
-0.4.24
+0.4.25

data/framework_components/monitoring-bot/monitoring-bot.rb

@@ -5,6 +5,7 @@ require_relative '../../lib/commands/util/components_list'
 require 'active_support/core_ext/object/deep_dup'
 require 'mandrill'
 require 'mongo'
+require 'bson'
 
 # Framework bots can access all the parameters they need directly
 # from the configuration file and the runlist,
@@ -312,6 +313,7 @@ nutella.f.net.handle_requests_on_all_runs('monitoring/application', lambda do |r
 end)
 
 nutella.f.net.handle_requests_on_all_runs('monitoring/message', lambda do |request, appId, runId, from|
+
   application = request['application']
   instance = request['instance']
   channel = request['channel']
@@ -320,16 +322,21 @@ nutella.f.net.handle_requests_on_all_runs('monitoring/message', lambda do |reque
 
   messages = []
 
-  collection.find({'channel' => "/nutella/apps/#{application}/runs/#{instance}/#{channel}"}).sort({:_id => -1}).limit(5).each do |message|
+  timestamp_low = (Time.now-3600).to_f # Last hour
+  timestamp_high = Time.now.to_f
+  object_id_low = BSON::ObjectId.from_string((timestamp_low).floor.to_s(16) + "0000000000000000")
+  object_id_high = BSON::ObjectId.from_string((timestamp_high).floor.to_s(16) + "0000000000000000")
+
+
+  collection .find({ '_id' => { '$gt' => object_id_low, '$lt' => object_id_high }, 'channel' => "/nutella/apps/#{application}/runs/#{instance}/#{channel}"}).sort({'_id' => -1}).limit(50).each do |message|
     m = {
         'from' => '',
         'to' => '',
         'from' => '',
-        'date' => message['_id'],
+        'date' => message['_id'].generation_time.getlocal.to_s,
         'type' => message['message']['type'],
         'payload' => message['message']['payload']
     }
-    puts m['date']
     messages.push(m)
   end
 

data/framework_components/monitoring-bot/startup

@@ -2,5 +2,5 @@
 
 BASEDIR=$(dirname $0)
 
-ruby $BASEDIR/monitoring-bot.rb # > /dev/null 2>&1 &
+ruby $BASEDIR/monitoring-bot.rb > /dev/null 2>&1 &
 echo $! > $BASEDIR/.pid

data/framework_components/monitoring-interface/js/react/dist/ui-messages.js

@@ -46,7 +46,7 @@ var UIMessages = React.createClass({displayName: "UIMessages",
                         React.createElement("a", {"data-toggle": "collapse", "data-parent": "#accordion", href: "#collapse"+index, "aria-expanded": "true", "aria-controls": "collapse"+index}, 
                             React.createElement("div", {className: "panel-heading", role: "tab", id: "headingOne"}, 
                                 React.createElement("h4", {className: "panel-title"}, 
-                                date.getUTCDate()+"/"+(date.getUTCMonth()+1)+"/"+date.getUTCFullYear()+" "+date.getUTCHours()+":"+date.getUTCMinutes()+":"+date.getUTCSeconds()+"."+date.getUTCMilliseconds()+
+                                date.getDate()+"/"+(date.getMonth()+1)+"/"+date.getFullYear()+" "+date.getHours()+":"+date.getMinutes()+":"+date.getSeconds()+"."+date.getMilliseconds()+
                                 " - "+message.type
                                 )
                             )
@@ -72,7 +72,7 @@ var UIMessages = React.createClass({displayName: "UIMessages",
                         React.createElement("button", {type: "button", className: "close", "data-dismiss": "modal", "aria-label": "Close"}, 
                             React.createElement("span", {"aria-hidden": "true"}, "×")
                         ), 
-                        React.createElement("h4", {className: "modal-title", id: "modalLabel"}, "Message display"), 
+                        React.createElement("h4", {className: "modal-title", id: "modalLabel"}, "Message display for channel ", React.createElement("span", {className: "label label-default"}, messageModel.channel)), 
                         React.createElement("svg", {style: {height: "40px", width: "100%"}, viewBox: "0 0 1000 40"}, 
                             React.createElement("text", {x: "50", y: "20", textAnchor: "middle", fill: "black"}, this.state.to), 
                             React.createElement("text", {x: "950", y: "20", textAnchor: "middle", fill: "black"}, this.state.from), 

data/framework_components/monitoring-interface/js/react/src/ui-messages.js

@@ -46,7 +46,7 @@ var UIMessages = React.createClass({
                         <a data-toggle="collapse" data-parent="#accordion" href={"#collapse"+index} aria-expanded="true" aria-controls={"collapse"+index}>
                             <div className="panel-heading" role="tab" id="headingOne">
                                 <h4 className="panel-title">
-                                {date.getUTCDate()+"/"+(date.getUTCMonth()+1)+"/"+date.getUTCFullYear()+" "+date.getUTCHours()+":"+date.getUTCMinutes()+":"+date.getUTCSeconds()+"."+date.getUTCMilliseconds()+
+                                {date.getDate()+"/"+(date.getMonth()+1)+"/"+date.getFullYear()+" "+date.getHours()+":"+date.getMinutes()+":"+date.getSeconds()+"."+date.getMilliseconds()+
                                 " - "+message.type}
                                 </h4>
                             </div>
@@ -72,7 +72,7 @@ var UIMessages = React.createClass({
                         <button type="button" className="close" data-dismiss="modal" aria-label="Close">
                             <span aria-hidden="true">&times;</span>
                         </button>
-                        <h4 className="modal-title" id="modalLabel">Message display</h4>
+                        <h4 className="modal-title" id="modalLabel">Message display for channel <span className="label label-default">{messageModel.channel}</span></h4>
                         <svg style={{height: "40px", width: "100%"}} viewBox="0 0 1000 40">
                             <text x="50" y="20" textAnchor="middle" fill="black">{this.state.to}</text>
                             <text x="950" y="20" textAnchor="middle" fill="black">{this.state.from}</text>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutella_framework
 version: !ruby/object:Gem::Version
-  version: 0.4.24
+  version: 0.4.25
 platform: ruby
 authors:
 - Alessandro Gnoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -176,6 +176,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: bson
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement