tailog 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a96a77ac5c624154a347d958d89ec3646b025c4
-  data.tar.gz: c1fe7e1ee366f1c633890c8de1c575f6146ef533
+  metadata.gz: 94898f11ab8489deacbdd01e07f902ac201740f3
+  data.tar.gz: 4d42e7d30f37d856c349e3ffadc5a91d070fde1e
 SHA512:
-  metadata.gz: cdc93b392d1fa36f91c97ec62b4403e117bdf49c49ad0f86ac71953835aa65ee33bd7657a7c92b625643f26fee74fc0a926e7b9b9935221fe954199864e656ce
-  data.tar.gz: 146f2c87a92bd07da1fd1f228ed34279174c2fcd5681c1651ae9ecb8a732a3c1dc1893eb08a798b55e898b131ae0fc0d44b2b2c7db0bc8d13c97bf78099d21de
+  metadata.gz: 7c0ceab245395356fbc3ba8be2e8c7ef943814e54dcafbde612c496a4dd5b6d8069fe0acaca37cc3e44bbb84fc92952e625b18c0e313aa7751ba305917fce8f2
+  data.tar.gz: 90be1575fd13c56462793d667298f880ecf1c3334af0a4374b908a654642971957e14ff63f5cc5c1d39030a404cced5ba38d46ce877b3951b6dbd3d5df0e98c1

data/app/views/error.erb

@@ -0,0 +1,6 @@
+<div class="alert alert-danger monospace">
+  <h4><%= h error.class %>: <%= h error.message %></h4>
+  <% error.backtrace.each do |backtrace| %>
+    <%= h backtrace %><br>
+  <% end %>
+</div>

data/app/views/{index.erb → logs/index.erb}

@@ -64,43 +64,43 @@
         <% file_path = File.join Tailog.log_path, params[:file] %>
         <h3 class="page-header monospace"><%= file_path %></h3>
 
-        <% File.open file_path do |file| %>
-
-          <div id="content" class="monospace">
-            <% file_size = file.size %>
-            <% file.tail(100).each do |line| %>
-              <p><%= h line %></p>
-            <% end %>
-          </div>
-
-          <script type="text/javascript">
-            window.fileSize = <%= file_size %>;
-            window.fileSizeDone = {};
-            var $window = $(window),
-                $document = $(document),
-                $content = $("#content");
-
-            setInterval(function() {
-              $.get(window.location.href, { seek: window.fileSize }, function(data) {
-                var $data = $(data);
-
-                if (window.fileSizeDone[window.fileSize]) {
-                  return
-                } else if (!$data.length) {
-                  window.fileSizeDone[window.fileSize] = true
+        <% File.open file_path do |file| end %>
+        <div id="content" class="monospace"></div>
+
+        <script type="text/javascript">
+          window.fileSize = {};
+          window.fileSizeDone = {};
+          var $window = $(window),
+              $document = $(document),
+              $content = $("#content");
+
+          function loadMore() {
+            $.post(window.location.href, { seek: window.fileSize }, function(json) {
+              try {
+                var data = JSON.parse(json);
+
+                var fileSizeKey = data.server_uuid + '-' + data.file_size;
+                if (window.fileSizeDone[fileSizeKey]) return;
+                window.fileSizeDone[fileSizeKey] = true;
+                window.fileSize[data.server_uuid] = data.file_size;
+
+                if (!data.content) return;
+                var shouldScrollToBottom = $window.scrollTop() + $window.height() == $document.height();
+                $(data.content).appendTo($content);
+
+                if (shouldScrollToBottom) {
+                  $window.scrollTop($document.height() - $window.height());
                 }
 
-                if ($window.scrollTop() + $window.height() == $document.height()) {
-                  $(data).appendTo($content);
-                  $window.scrollTop($document.height() - $window.height())
-                } else {
-                  $(data).appendTo($content);
-                }
-              });
-            }, 3000);
-          </script>
+              } catch (error) {
+                console.log(error)
+              }
+            });
+          }
 
-        <% end %>
+          setInterval(loadMore, 3000);
+          loadMore();
+        </script>
 
       <% else %>
         <div id="content" class="monospace">
@@ -112,12 +112,7 @@
       <% end %>
 
     <% rescue => error %>
-      <div class="alert alert-danger">
-        <h4><%= h error.class %>: <%= h error.message %></h4>
-        <% error.backtrace.each do |backtrace| %>
-          <%= h backtrace %><br>
-        <% end %>
-      </div>
+      <%= erb :error, locals: { error: error } %>
     <% end %>
 
   </div> <!-- /container -->

data/app/views/logs/list.erb

@@ -0,0 +1,3 @@
+<% file.each_line do |line| %>
+  <p><%= h line %></p>
+<% end %>

data/lib/tailog/version.rb

@@ -1,3 +1,3 @@
 module Tailog
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/lib/tailog.rb

@@ -1,7 +1,9 @@
 require 'tailog/version'
-require 'tailog/ext/file'
 require 'sinatra/base'
 require 'active_support/configurable'
+require 'tailog/ext/file'
+require 'securerandom'
+require 'json'
 
 module Tailog
   include ActiveSupport::Configurable
@@ -10,6 +12,10 @@ module Tailog
     File.expand_path("log", Dir.pwd)
   end
 
+  config_accessor :server_uuid do
+    SecureRandom.uuid
+  end
+
   class App < Sinatra::Base
     set :root, File.expand_path("../../app", __FILE__)
     set :public_folder do "#{root}/assets" end
@@ -22,11 +28,31 @@ module Tailog
     end
 
     get '/' do
-      if params[:seek]
-        erb :ajax
-      else
-        erb :index
+      redirect to('/logs')
+    end
+
+    get '/logs' do
+      erb :'logs/index'
+    end
+
+    post '/logs' do
+      begin
+        file_path = File.join Tailog.log_path, params[:file]
+        file = File.open file_path
+        file_size = file.size
+        seek = params[:seek] && params[:seek][Tailog.server_uuid] || file_size
+        file.seek seek.to_i
+        content = erb :'logs/list', locals: { file: file }
+        file.close
+      rescue => error
+        content = erb :error, locals: { error: error }
       end
+
+      {
+        server_uuid: Tailog.server_uuid,
+        file_size: file_size,
+        content: content
+      }.to_json
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tailog
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - bbtfr
@@ -50,8 +50,9 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- app/views/ajax.erb
-- app/views/index.erb
+- app/views/error.erb
+- app/views/logs/index.erb
+- app/views/logs/list.erb
 - bin/console
 - bin/setup
 - lib/tailog.rb

data/app/views/ajax.erb

@@ -1,21 +0,0 @@
-<% begin %>
-  <% file_path = File.join Tailog.log_path, params[:file] %>
-  <% File.open file_path do |file| %>
-    <% file_size = file.size %>
-    <% file.seek params[:seek].to_i %>
-    <% file.each_line do |line| %>
-      <p><%= h line %></p>
-    <% end %>
-    <script type="text/javascript">
-      if (window.fileSize < <%= file_size %>)
-        window.fileSize = <%= file_size %>;
-    </script>
-  <% end %>
-<% rescue => error %>
-  <div class="alert alert-danger">
-    <h4><%= h error.class %>: <%= h error.message %></h4>
-    <% error.backtrace.each do |backtrace| %>
-      <%= h backtrace %><br>
-    <% end %>
-  </div>
-<% end %>