Commit d570deea authored by Paul Asmuth's avatar Paul Asmuth
Browse files

session_view integration wip (2)

parent f37c22d5
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ TODO
- timeseries-widget: cardinal on/off should be skeuomorph
- proper cmdline output (status?)
- caching
- fix specs

- namespace picker in sidebar
- split up fnordmetric.namespace block into multiple files
@@ -21,7 +22,6 @@ TODO
- timeseries-gauge: punchcards
- incr_fraction: implement progressive
- timeseries gauge: restrict to max resolution
- fix specs
- formatter: num, time, currency, percent, time_of_day
- minimize/pack js + css
- put images into one sprite
@@ -34,8 +34,8 @@ TODO



README
------
WIKI
----

  > fnordmetric
    > sending data 
+9 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ private
    messages << discover(ns) if event["type"] == "discover_request"
    messages << widget(ns, event) if event["type"] == "widget_request"
    messages << gauge(ns, event) if event["type"] == "render_request"
    messages << active_users(ns, event) if event["type"] == "active_users_request"
    messages.flatten.compact
  end

@@ -49,4 +50,12 @@ private
    end.compact]
  end

  def active_users(namespace, event)
    puts "FUBAR"

    {
      :type => "active_users_response"
    }
  end

end
+21 −7
Original line number Diff line number Diff line
@@ -58,16 +58,16 @@ FnordMetric.views.sessionView = (function(){

  function doSessionPoll(){
    return (function(){
      $.ajax({
      /*$.ajax({
        url: FnordMetric.p + '/' + FnordMetric.currentNamespace+'/sessions',
        success: callbackSessionPoll()
      });
      });*/
    });
  };

  function loadEventHistory(params){
    feedInnerElem.html('');
    $.ajax({
    /*$.ajax({
      url: FnordMetric.p + '/' + FnordMetric.currentNamespace+'/events',
      data: params,
      success: function(_data, _status){
@@ -76,7 +76,7 @@ FnordMetric.views.sessionView = (function(){
          if(data[n]){ renderEvent(data[n]); }
        }
      }
    });
    });*/
  }

  function callbackSessionPoll(){
@@ -89,7 +89,7 @@ FnordMetric.views.sessionView = (function(){
  };

  function loadEventTypes(){
    $.ajax({
    /*$.ajax({
      url: FnordMetric.p + '/' + FnordMetric.currentNamespace+'/event_types',
      success: function(_data){
        var data = JSON.parse(_data);
@@ -99,7 +99,7 @@ FnordMetric.views.sessionView = (function(){
          }
        });
      }
    });
    });*/
  };

  function setCheckboxesCheckedState(types_state, sessions_state) {
@@ -145,13 +145,26 @@ FnordMetric.views.sessionView = (function(){

  function doEventsPoll(){
    return (function(){
      $.ajax({

      /*$.ajax({
        url: FnordMetric.p + '/' + FnordMetric.currentNamespace+'/events?since='+eventsPolledUntil,
        success: callbackEventsPoll()
      });*/

      console.log("pub", eventsPolledUntil);

      FnordMetric.publish({
        "type": "active_users_request",
        "since": eventsPolledUntil
      });

    });
  };

  function announce(evt){
    console.log(evt);
  }

  function callbackEventsPoll(){
    return (function(_data, _status){
      var data = JSON.parse(_data)
@@ -324,6 +337,7 @@ FnordMetric.views.sessionView = (function(){
  return {
    load: load,
    resize: resize,
    announce: announce,
    close: close
  };