remove tail logs

Author: le0pard

app/assets/javascripts/logs.js.coffee

@@ -12,15 +12,10 @@ root.MongodbLoggerMain =
     $(document).ajaxStart => $('#ajaxLoader').show()
     $(document).ajaxStop => $('#ajaxLoader').hide()
     # tail logs buttons
-    $(document).on 'click', '#tailLogsLink', (event) =>
-      event.preventDefault()
-      MongodbLoggerMain.tailLogsUrl = $(event.currentTarget).data('url')
-      $('#tailLogsBlock').addClass('started')
-      MongodbLoggerMain.tailLogs(null)
-    $(document).on 'click', '#tailLogsStopLink', (event) =>
-      event.preventDefault()
-      MongodbLoggerMain.tailLogStarted = false
-      $('#tailLogsBlock').removeClass('started')
+    $(document).on 'click', '#filterLogsLink', (event) =>
+      @showFilters(event)
+    $(document).on 'click', '#filterLogsStopLink', (event) =>
+      @hideFilters(event)
     # log info click
     $(document).on 'click', '.log_info', (event) =>
       event.preventDefault()
@@ -30,9 +25,7 @@ root.MongodbLoggerMain =
       $('#logInfo').html(MustacheTemplates["logs/info"]({ log: element.data('info') }))
     # filter tougle
     $(document).on 'click', 'div.filter_toggle', (event) =>
-      event.preventDefault()
-      $('div.filter').slideToggle()
-      $('div.filter_toggle span.arrow-down').toggleClass('rotate')
+      @toggleFilters(event)
     # additional filters
     $(document).on 'click', '#addMoreFilter', (event) =>
       event.preventDefault()
@@ -90,8 +83,23 @@ root.MongodbLoggerMain =
         when 40 # down
           MongodbLoggerMain.moveByLogs('down')
     # init pjax
-    this.initPjax()
-    this.initOnPages()
+    @initPjax()
+    @initOnPages()
+  showFilters: (e) ->
+    e.preventDefault()
+    $('div.filter').slideDown()
+    $('div.filter_toggle span.arrow-down').addClass('rotate')
+    $('#filterLogsBlock').addClass('started')
+  hideFilters: (e) ->
+    e.preventDefault()
+    $('div.filter').slideUp()
+    $('div.filter_toggle span.arrow-down').removeClass('rotate')
+    $('#filterLogsBlock').removeClass('started')
+  toggleFilters: (e) ->
+    if $('div.filter_toggle span.arrow-down').hasClass('rotate')
+      @hideFilters(e)
+    else
+      @showFilters(e)
   initPjax: ->
     # pjax
     $(document).pjax('a[data-pjax]', '#mainPjax')
@@ -124,29 +132,6 @@ root.MongodbLoggerMain =
         else
           $("#logInfo").stop().animate
             marginTop: 0
-  # tail logs function
-  tailLogs: (logLastId = null) ->
-    url = MongodbLoggerMain.tailLogsUrl
-    if logLastId? and logLastId.length
-      url = "#{MongodbLoggerMain.tailLogsUrl}/#{logLastId}"
-    else
-      MongodbLoggerMain.tailLogStarted = true
-    return false unless MongodbLoggerMain.tailLogStarted
-    $.ajax
-      url: url
-      dataType: "json"
-      success: (data) ->
-        if data.time
-          $('#tailLogsTime').text(data.time)
-          if data.log_last_id?
-            logLastId = data.log_last_id
-          if data.content? && data.content.length > 0
-            elements = $(data.content)
-            elements.addClass('newlog')
-            $('#logsList tr:first').after(elements).effect("highlight", {}, 1000)
-          if data.collection_stats && $("#collection_stats").length > 0
-            $("#collection_stats").html(data.collection_stats)
-        setTimeout((-> MongodbLoggerMain.tailLogs(logLastId)), 2000) if MongodbLoggerMain.tailLogStarted
   # move using keys by logs
   moveByLogs: (direction) ->
     if $('#logsList').length and $('#logsList').find('tr.current').length
@@ -189,6 +174,5 @@ root.MongodbLoggerMain =
     elemTop = $(elem).offset().top
     elemBottom = elemTop + $(elem).height()
     return ((docViewTop < elemTop) && (docViewBottom > elemBottom))
-
-$ ->
-  MongodbLoggerMain.init()
+# init
+$ -> MongodbLoggerMain.init()

app/assets/stylesheets/library.css.erb

@@ -144,7 +144,7 @@ code {
     background: -ms-linear-gradient(top,  rgba(238,238,238,1) 0%,rgba(211,211,211,1) 100%);
     background: linear-gradient(top,  rgba(238,238,238,1) 0%,rgba(211,211,211,1) 100%);
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#d3d3d3',GradientType=0 );
-    
+
 }
 
 .logs-time {
@@ -162,11 +162,11 @@ code {
 }
 
 
-#tailLogsBlock.started .info, #tailLogsBlock .initial {
+#filterLogsBlock.started .info, #filterLogsBlock .initial {
   display: inline-block;
 }
 
-#tailLogsBlock .info, #tailLogsBlock.started .initial {
+#filterLogsBlock .info, #filterLogsBlock.started .initial {
   display: none;
 }
 
@@ -204,7 +204,7 @@ li.message_tab {
     padding: 0 20px;
     height: 30px;
     line-height: 30px;
-    font-size: 14px;    
+    font-size: 14px;
     border-right: 1px solid #bbb;
     border-top: 0;
     color: #333;
@@ -219,7 +219,7 @@ li.message_tab {
     background: -ms-linear-gradient(top,  rgba(255,255,255,0.62) 0%,rgba(23,146,212,0.5) 100%);
     background: linear-gradient(top,  rgba(255,255,255,0.62) 0%,rgba(23,146,212,0.5) 100%);
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9effffff', endColorstr='#801792d4',GradientType=0 );
-    
+
 }
 
 .message_tabs li.active {
@@ -285,7 +285,7 @@ a[target="_blank"] {
     background: -ms-linear-gradient(top,  rgba(191,210,85,1) 0%,rgba(142,185,42,1) 50%,rgba(114,170,0,1) 51%,rgba(158,203,45,1) 100%);
     background: linear-gradient(top,  rgba(191,210,85,1) 0%,rgba(142,185,42,1) 50%,rgba(114,170,0,1) 51%,rgba(158,203,45,1) 100%);
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#bfd255', endColorstr='#9ecb2d',GradientType=0 );
-    
+
 }
 
 .size {

lib/mongodb_logger/adapters/mongo.rb

@@ -40,34 +40,13 @@ def rename_collection(to, drop_target = false)
 
       # filter
       def filter_by_conditions(filter)
-        @collection.find(filter.get_mongo_conditions).sort('$natural', -1).limit(filter.get_mongo_limit)
+        @collection.find(filter.get_mongo_conditions).limit(filter.get_mongo_limit).sort('$natural', -1)
       end
 
       def find_by_id(id)
         @collection.find_one(::BSON::ObjectId.from_string(id))
       end
 
-      def tail_log_from_params(params = {})
-        logs = []
-        last_id = nil
-        if params[:log_last_id] && !params[:log_last_id].blank?
-          log_last_id = params[:log_last_id]
-          @collection.find({'_id' => { '$gt' => ::BSON::ObjectId.from_string(log_last_id) }}).sort('$natural', -1).each do |log|
-            logs << log
-            log_last_id = log["_id"].to_s
-          end
-          logs.reverse!
-        else
-          log = @collection.find_one({}, { sort: ['$natural', -1] })
-          log_last_id = log["_id"].to_s unless log.blank?
-        end
-        {
-          log_last_id: log_last_id,
-          time: Time.now.strftime("%F %T"),
-          logs: logs
-        }
-      end
-
       def calculate_mapreduce(map, reduce, params = {})
         @collection.map_reduce(map, reduce, { query: params[:conditions], sort: ['$natural', -1], out: { inline: true }, raw: true }).find()
       end

lib/mongodb_logger/adapters/moped.rb

@@ -42,34 +42,13 @@ def rename_collection(to, drop_target = false)
 
       # filter
       def filter_by_conditions(filter)
-        @collection.find(filter.get_mongo_conditions).sort('$natural' => -1).limit(filter.get_mongo_limit)
+        @collection.find(filter.get_mongo_conditions).limit(filter.get_mongo_limit).sort('$natural' => -1)
       end
 
       def find_by_id(id)
         @collection.find("_id" => ::BSON::ObjectId.from_string(id)).first
       end
 
-      def tail_log_from_params(params = {})
-        logs = []
-        last_id = nil
-        if params[:log_last_id] && !params[:log_last_id].blank?
-          log_last_id = params[:log_last_id]
-          @collection.find({'_id' => { '$gt' => ::BSON::ObjectId.from_string(log_last_id) }}).sort('$natural' => -1).each do |log|
-            logs << log
-            log_last_id = log["_id"].to_s
-          end
-          logs.reverse!
-        else
-          log = @collection.find.sort('$natural' => -1).first
-          log_last_id = log["_id"].to_s unless log.blank?
-        end
-        {
-          log_last_id: log_last_id,
-          time: Time.now.strftime("%F %T"),
-          logs: logs
-        }
-      end
-
       def calculate_mapreduce(map, reduce, params = {})
         @connection.command(
           mapreduce: collection_name,