mongodb_logger 0.3.3 → 0.4.0

data/lib/mongodb_logger/replica_set_helper.rb

@@ -2,18 +2,27 @@ module MongodbLogger
   module ReplicaSetHelper
     # Use retry alg from mongodb to gobble up connection failures during replica set master vote
     # Defaults to a 10 second wait
-    def rescue_connection_failure(max_retries=40)
+    def rescue_connection_failure(max_retries = 40)
       success = false
       retries = 0
       while !success
         begin
           yield
           success = true
-        rescue Mongo::ConnectionFailure => e
+        rescue mongo_error_type => e
           raise e if (retries += 1) >= max_retries
           sleep 0.25
         end
       end
     end
+    
+    private
+    
+    def mongo_error_type
+      return @mongo_error if @mongo_error
+      @mongo_error = Mongo::ConnectionFailure if defined?(Mongo) && defined?(Mongo::ConnectionFailure)
+      @mongo_error = Moped::SocketError  if defined?(Moped) && defined?(Moped::SocketError)
+      @mongo_error
+    end
   end
 end

data/lib/mongodb_logger/server.rb

@@ -57,14 +57,8 @@ module MongodbLogger
     
     before do
       begin
-        if ServerConfig.db && ServerConfig.collection
-          @db = ServerConfig.db
-          @collection = ServerConfig.collection
-        else
-          @db = Rails.logger.mongo_connection
-          @collection = @db[Rails.logger.mongo_collection_name]
-        end
-        @collection_stats = @collection.stats
+        @mongo_adapter = (ServerConfig.mongo_adapter ? ServerConfig.mongo_adapter : Rails.logger.mongo_adapter)
+        @collection_stats = @mongo_adapter.collection_stats
       rescue => e
         erb :error, {:layout => false}, :error => "Can't connect to MongoDB!"
         return false
@@ -89,33 +83,19 @@ module MongodbLogger
     %w( overview ).each do |page|
       get "/#{page}/?" do
         @filter = ServerModel::Filter.new(params[:filter])
-        @logs = @collection.find(@filter.get_mongo_conditions).sort('$natural', -1).limit(@filter.get_mongo_limit)
+        @logs = @mongo_adapter.filter_by_conditions(@filter)
         show page, !request.xhr?
       end
     end
     
     get "/tail_logs/?:log_last_id?" do
-      buffer = []
-      last_id = nil
-      if params[:log_last_id] && !params[:log_last_id].blank?
-        log_last_id = params[:log_last_id]
-        tail = Mongo::Cursor.new(@collection, :tailable => true, :order => [['$natural', 1]], 
-          :selector => {'_id' => { '$gt' => BSON::ObjectId(log_last_id) }})
-        while log = tail.next
-          buffer << partial(:"shared/log", :object => log)
-          log_last_id = log["_id"].to_s
-        end
-        buffer.reverse!
-      else
-        @log = @collection.find_one({}, {:sort => ['$natural', -1]})
-        log_last_id = @log["_id"].to_s unless @log.blank?
-      end
-      
-      content_type :json
-      { :log_last_id => log_last_id, 
-        :time => Time.now.strftime("%F %T"), 
-        :content => buffer.join("\n"), 
-        :collection_stats => partial(:"shared/collection_stats", :object => @collection_stats) }.to_json
+      @info = @mongo_adapter.tail_log_from_params(params)
+      @info.merge!(
+        :content => @info[:logs].map{|log| partial(:"shared/log", :object => log) }.join("\n"),
+        :collection_stats => partial(:"shared/collection_stats", :object => @collection_stats)
+      )
+      content_type :json 
+      @info.to_json
     end
     
     get "/changed_filter/:type" do
@@ -133,13 +113,13 @@ module MongodbLogger
     
     # log info
     get "/log/:id" do
-      @log = @collection.find_one(BSON::ObjectId(params[:id]))
+      @log = @mongo_adapter.find_by_id(params[:id])
       show :show_log, !request.xhr?
     end
     
     # log info right
     get "/log_info/:id" do
-      @log = @collection.find_one(BSON::ObjectId(params[:id]))
+      @log = @mongo_adapter.find_by_id(params[:id])
       partial(:"shared/log_info", :object => @log)
     end
     
@@ -152,14 +132,13 @@ module MongodbLogger
     # analytics
     %w( analytics ).each do |page|
       get "/#{page}/?" do
-        @analytic = ServerModel::Analytic.new(@collection, params[:analytic])
+        @analytic = ServerModel::Analytic.new(@mongo_adapter, params[:analytic])
         show page, !request.xhr?
       end
       post "/#{page}/?" do
-        @analytic = ServerModel::Analytic.new(@collection, params[:analytic])
-        @analytic_data = @analytic.get_data
+        @analytic = ServerModel::Analytic.new(@mongo_adapter, params[:analytic])
         content_type :json
-        @analytic_data.to_json
+        @analytic.get_data.to_json
       end
     end
     

data/lib/mongodb_logger/server/model/analytic.rb

@@ -2,32 +2,22 @@ module MongodbLogger
   module ServerModel
     class Analytic
       
-      FIXED_PARAMS_ON_FORM = ['type', 'start_date', 'end_date']
+      FIXED_PARAMS_ON_FORM = ['type', 'unit', 'start_date', 'end_date']
       ANALYTIC_TYPES = [[0, "Count of requests"], [1, "Count of errors"]]
-      ANALYTIC_HEADERS = [
-        {
-          :key => ["year", "month", "day"],
-          :value => ["count"]
-        },
-        {
-          :key => ["year", "month", "day"],
-          :value => ["count"]
-        }
-      ]
-      attr_reader :params, :collection
+      ANALYTIC_UNITS = [[0, "Month"], [1, "Day"], [2, "Hour"]]
+
+      attr_reader :params, :mongo_adapter
       FORM_NAME = "analytic"
       
-      
-      def initialize(collection, params)
+      def initialize(mongo_adapter, params)
         FIXED_PARAMS_ON_FORM.each do |key|
           create_variable(key, nil)
         end
-        @collection = collection
+        @mongo_adapter = mongo_adapter
         @params = params
         @params.each do |k,v|
           self.send("#{k}=", v) if self.respond_to?(k) && v && !v.blank?
         end unless @params.blank?
-        
         # def values
         self.start_date ||= Time.now.strftime('%Y-%m-%d')
         self.end_date ||= Time.now.strftime('%Y-%m-%d')
@@ -43,38 +33,65 @@ module MongodbLogger
         FORM_NAME
       end
       
-      def count_of_requests(conditions, is_errors = false)
-        collection_name = "mongodb_logger_count_of_requests"
-        map = "function() { var key = {year: this.request_time.getFullYear(), month: this.request_time.getMonth() + 1, day: this.request_time.getDate()}; emit(key, {count: 1});}"
-        reduce_count = "function(key, values) { var sum = 0; values.forEach(function(f) { sum += f.count; }); return {count: sum};}"
-        if is_errors
-          collection_name = "mongodb_logger_count_of_errors"
-          conditions.merge!({:is_exception => true})
+      def calculate_default_map_reduce(params = {})
+        addinional_params = case self.unit.to_i
+          when 1
+            "day: this.request_time.getDate()"
+          when 2
+            "day: this.request_time.getDate(), hour: this.request_time.getHours() + 1"
+          else
+            ""
         end
-        @collection.map_reduce(map, reduce_count, {:out => collection_name, :query => conditions, :sort => ['$natural', -1]})
+        map = <<EOF
+function() { 
+  var key = { 
+    year: this.request_time.getFullYear(), 
+    month: this.request_time.getMonth() + 1, 
+    #{addinional_params}
+  }; 
+  emit(key, {count: 1});
+}
+EOF
+        reduce = <<EOF
+function(key, values) { 
+  var sum = 0; 
+  values.forEach(function(f) { 
+    sum += f.count; 
+  }); 
+  return {count: sum};
+}
+EOF
+        case self.type.to_i
+          when 1
+            params[:conditions].merge!({:is_exception => true})
+          else
+            # nothing
+        end
+        
+        @mongo_adapter.calculate_mapreduce(map, reduce, {:conditions => params[:conditions]})
       end
       
       def get_data
-        m_start= Date.parse(self.start_date) rescue nil
-        m_start = Date.today if m_start.nil?
-        m_end = Date.parse(self.end_date) rescue nil
-        m_end = Date.today if m_end.nil?
+        m_start= Date.parse(self.start_date) rescue Date.today
+        m_end = Date.parse(self.end_date) rescue Date.today
         
         conditions = { :request_time => {
           '$gte' => Time.utc(m_start.year, m_start.month, m_start.day, 0, 0, 0), 
           '$lte' => Time.utc(m_end.year, m_end.month, m_end.day, 23, 59, 59)
         }}
         
-        mapreduce_collection = case self.type.to_i
-        when 0
-          count_of_requests(conditions)
-        when 1
-          count_of_requests(conditions, true)
-        else
-          count_of_requests(conditions)
-        end
+        all_data = calculate_default_map_reduce(
+          :conditions => conditions
+        )
         
-        {:data => mapreduce_collection.find(), :headers => ANALYTIC_HEADERS[self.type.to_i]}
+        {
+          :data => (all_data ? all_data.first.last : []), 
+          :headers => {
+            :key => ["year", "month", "day", "hour"],
+            :value => ["count"]
+          },
+          unit: self.unit
+        }
       end
       
     end

data/lib/mongodb_logger/server/view_helpers.rb

@@ -11,6 +11,10 @@ module Sinatra::ViewHelpers
     end
   end
   
+  def percent_of_userd_memory(collection_stats)
+    ((collection_stats[:size] / collection_stats[:storageSize]) * 100).round
+  end
+  
   def string_from_log_message(message)
     message.is_a?(Array) ? message.join("\n") : message.to_s
   end
@@ -19,7 +23,7 @@ module Sinatra::ViewHelpers
     meta_data = Hash.new
     log.each do |key, val|
       # predefined fields
-      next if [:_id, :messages, :request_time, :ip, :runtime, :application_name, :is_exception, :params, :method, :controller, :action, :path, :url].include?(key.to_sym)
+      next if [:_id, :messages, :request_time, :ip, :runtime, :application_name, :is_exception, :params, :method, :controller, :action, :session, :path, :url].include?(key.to_sym)
       meta_data[key] = val
     end
     meta_data

data/lib/mongodb_logger/server/views/analytics.erb

@@ -13,7 +13,7 @@
             </div>
             <div class="unit size1of2">
               <div class="prm">
-                <%#= text_field_tag @filter, :action, :placeholder => "Action" %>
+                <%= select_tag @analytic, :unit, MongodbLogger::ServerModel::Analytic::ANALYTIC_UNITS %>
               </div>
             </div>            
           </div>                
@@ -38,11 +38,12 @@
       </form>
       </div> <!-- filter -->
 
-      <div class="filter-toggle"><span class="arrow-down">Analyze</span></div>
-      
-      <div id="analyticData">
-        <div class="pal txtC">
-          Select what to analyze
+      <div class="filter_toggle filter-toggle"><span class="arrow-down">Analyze</span></div>
+      <div style="margin: 10px">
+        <div id="analyticData">
+          <div class="pal txtC">
+            Select what to analyze
+          </div>
         </div>
       </div>
       
@@ -51,7 +52,7 @@
   <div class="unit size1of4">
     <div class="details">
       
-      <div id="log_info">
+      <div id="logInfo">
         <div class="pale h2 pal txtC">
           Comming soon...
         </div> <!-- pale h2 -->

data/lib/mongodb_logger/server/views/layout.erb

@@ -10,19 +10,19 @@
     <div class="wrapper">
       <div class="unit-right stats">
         <div class="unit size2of3">
-          <div class="ptxs pls"><strong>DB:</strong> <%=h @db.name %></div>
-          <div class="pls"><strong>Collection:</strong> <%=h @collection.name %></div>
+          <div class="ptxs pls"><strong>DB:</strong> <%=h @collection_stats[:db_name] %></div>
+          <div class="pls"><strong>Collection:</strong> <%=h @collection_stats[:collection] %></div>
         </div> <!-- unit -->
         <div id="collection_stats">
           <%= partial(:"shared/collection_stats", :object => @collection_stats) %>
         </div>
       </div>
-      <a href="<%=h url_path("overview") %>" class="logo" data-pjax='#main_pjax'><img src="<%= asset_path 'logo.png' %>" alt="MongoDB Logger"></a>
+      <a href="<%=h url_path("overview") %>" class="logo" data-pjax='#mainPjax'><img src="<%= asset_path 'logo.png' %>" alt="MongoDB Logger"></a>
     </div> <!-- wrapper -->
   </div> <!-- header -->            
   <div class="content">
     <div class="wrapper">
-      <div id="main_pjax" class="mainbox">
+      <div id="mainPjax" class="mainbox">
         <%= yield %>
       </div> <!-- mainbox -->
     </div> <!-- wrapper -->
@@ -32,12 +32,5 @@
 <!-- scripts -->
 <script src="<%= asset_path('mongodb_logger.js') %>" type="text/javascript"></script>
 
-<!-- charts -->
-<script type="text/javascript" src="https://www.google.com/jsapi"></script>
-<script type="text/javascript">
-  google.load('visualization', '1', {'packages':['corechart']});
-  google.setOnLoadCallback(MongodbLoggerMain.init_analytic_charts);
-</script>
-
 </body>
 </html>

data/lib/mongodb_logger/server/views/overview.erb

@@ -1,4 +1,4 @@
-<% if @collection_stats["capped"] && (1 == @collection_stats["capped"] || true == @collection_stats["capped"]) %>
+<% if @collection_stats[:is_capped] %>
   <% content_for :right_top_panel do %>
     <%= partial(:"shared/tail_panel") %>
   <% end %>
@@ -49,7 +49,7 @@
         </div> <!-- outer -->
         
         <div class="outer">
-              <ul id="more_filter_list">
+              <ul id="moreFilterList">
                 <% @filter.more_filters.each_with_index do |f_filter, index| %>
                   <li>
                     <%= partial(:"shared/dynamic_filter", :object => f_filter) %>
@@ -57,7 +57,7 @@
                 <% end %>
               </ul>
               <div class="mbs">
-                <a id="add_more_filter" href="<%=h url_path("add_filter") %>" class="add">+ Add Filter</a>
+                <a id="addMoreFilter" href="<%=h url_path("add_filter") %>" class="add">+ Add Filter</a>
               </div>
               
         </div> <!-- outer -->
@@ -84,10 +84,10 @@
       </form>
       </div> <!-- filter -->
 
-      <div class="filter-toggle"><span class="arrow-down <%= 'rotate' unless @filter.get_mongo_conditions.blank? %>">Filter</span></div>
+      <div class="filter_toggle filter-toggle"><span class="arrow-down <%= 'rotate' unless @filter.get_mongo_conditions.blank? %>">Filter</span></div>
       
       <% if @logs.count > 0 %>
-        <table id="logs_list">
+        <table id="logsList">
           <tr>          
             <th>Received</th>
             <th>Controller</th>
@@ -109,7 +109,7 @@
   <div class="unit size1of4">
     <div class="details">
       
-      <div id="log_info">
+      <div id="logInfo">
         <div class="pale h2 pal txtC">
           Please choose log to see details
         </div> <!-- pale h2 -->

data/lib/mongodb_logger/server/views/shared/_collection_stats.erb

@@ -1,11 +1,11 @@
 <div class="unit size1of3">
   <div class="pts prs txtR">
-    <span class="log-num" title="count of logs"><%=h collection_stats["count"] %></span></div>
+    <span class="log-num" title="count of logs"><%=h collection_stats[:count] %></span></div>
 </div> <!-- unit -->
-<% if collection_stats["capped"] && (1 == collection_stats["capped"] || true == collection_stats["capped"]) %>
+<% if collection_stats[:is_capped] %>
   <div class="progress">
-    <span class="size"><%=h number_to_human_size(collection_stats["size"]) %> of <%=h number_to_human_size(collection_stats["storageSize"]) %></span>
-    <div class="used" style="width: <%=((collection_stats["size"].to_f / collection_stats["storageSize"].to_f) * 100).round%>%"></div>
+    <span class="size"><%=h number_to_human_size(collection_stats[:size]) %> of <%=h number_to_human_size(collection_stats[:storageSize]) %></span>
+    <div class="used" style="width: <%= percent_of_userd_memory(collection_stats) %>%"></div>
   </div> <!-- progress -->
 <% else %>
   <div class="warning"><p>You do not use capped collection for logs. 

data/lib/mongodb_logger/server/views/shared/_dynamic_filter.erb

@@ -2,7 +2,7 @@
   <div class="unit size1of3">
     <div class="unit size1of2">
       <div class="prm">
-        <%= select_tag dynamic_filter, :type, MongodbLogger::ServerModel::AdditionalFilter::VAR_TYPES, :class => "filter_type", :rel => url_path("changed_filter") %>
+        <%= select_tag dynamic_filter, :type, MongodbLogger::ServerModel::AdditionalFilter::VAR_TYPES, :class => "filter_type", "data-url" => url_path("changed_filter") %>
       </div> <!-- prm -->      
     </div> <!-- unit -->
     <div class="unit size1of2">

data/lib/mongodb_logger/server/views/shared/_log_info.erb

@@ -1,6 +1,6 @@
 <div class="pas">
   <div class="unit-right">
-    <a href="<%=h url_path("log/#{log_info['_id']}") %>" data-pjax='#main_pjax' class="button small grey">More Info</a>
+    <a href="<%=h url_path("log/#{log_info['_id']}") %>" data-pjax='#mainPjax' class="button small grey">More Info</a>
   </div> <!-- unit-right -->
   <h2 class="phs mvs"><span class="<%= log_info['is_exception'] ? 'failure' : 'success' %>">Message</span></h2>
   <div class="phs wrap_text">

data/lib/mongodb_logger/server/views/shared/_tabs.erb

@@ -1,4 +1,4 @@
 <ul class="unit">
-  <li <%= class_if_current(url_path("overview")) %>><a href="<%=h url_path("overview") %>" data-pjax='#main_pjax'>Logs</a></li>
-  <li <%= class_if_current(url_path("analytics")) %>><a href="<%=h url_path("analytics") %>" data-pjax='#main_pjax'>Analytics</a></li>
+  <li <%= class_if_current(url_path("overview")) %>><a href="<%=h url_path("overview") %>" data-pjax='#mainPjax'>Logs</a></li>
+  <li <%= class_if_current(url_path("analytics")) %>><a href="<%=h url_path("analytics") %>" data-pjax='#mainPjax'>Analytics</a></li>
 </ul>

data/lib/mongodb_logger/server/views/shared/_tail_panel.erb

@@ -1,12 +1,12 @@
-<div id="tail_logs_block">
+<div id="tailLogsBlock">
   <div class="initial">
-    <a id="tail_logs_link" href="#" data-url="<%=h url_path("tail_logs") %>" class="button mts mrs">
+    <a id="tailLogsLink" href="#" data-url="<%=h url_path("tail_logs") %>" class="button mts mrs">
       <span class="start" data-url="<%=h url_path("tail_logs") %>">Tail</span>
     </a>
   </div>
   <div class="info">
-    <span id="tail_logs_time" class="logs-time mrs"></span>
-    <a id="tail_logs_stop_link" href="#" class="button negative mts mrs">
+    <span id="tailLogsTime" class="logs-time mrs"></span>
+    <a id="tailLogsStopLink" href="#" class="button negative mts mrs">
       <span class="stop">Stop</span>
     </a>
   </div>