tailog 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eee8873170ab412654ccf81ce8f59df6aa03667
-  data.tar.gz: 5bedb6af7297342259ec7611c6032f9a377bb175
+  metadata.gz: 9e883f46101f9d9932bd47c8d275fc4c304a7026
+  data.tar.gz: 6ca0aa4bfc2d1806f386465153607b24d7a18683
 SHA512:
-  metadata.gz: 5cc194e4d7df33a18a0b40ed633b0e815e7151141f8e9f82dbfb0118631f7999232a7fe73aed68f15349d9e7c8b7bb0cb7c43a74edc1dbe045b10e5b1a461092
-  data.tar.gz: c387dcef3da18acf98217c77372535b805b381ccd7a0683e2c33409d89fc4c59a47f3bf022fa61a5812e65b16d0bae88b93fd6e85e0edae418960f11fef7af74
+  metadata.gz: 0a3741b98e3cf6b9bed879a6e66c12678d75c2bf3a61db9667724851d44a76186209080166d84866212770a3103f427ec0d134e98f42af0565cfa5a37a4ddb87
+  data.tar.gz: 3fcc682690a3242219f6af6939e2b5d3a174cc0f352f2f387810be6907a87afa04d68f9cd3db916e4cb99cfb0a78700d9769d24c8b400e9c11c02bc2d60386bb

data/app/views/layout.erb

@@ -45,7 +45,7 @@
   <div class="container">
 
     <!-- Static navbar -->
-    <% p path_info = request.path_info %>
+    <% path_info = request.path_info %>
     <nav class="navbar navbar-default">
       <div class="container-fluid">
         <div class="navbar-header">

data/app/views/logs/index.erb

@@ -22,15 +22,15 @@
           try {
             var data = JSON.parse(json);
 
-            var fileSizeKey = data.server_uuid + '-' + data.file_size;
+            var fileSizeKey = data.server_hostname + '-' + data.file_size;
             if (window.fileSizeDone[fileSizeKey]) return;
             window.fileSizeDone[fileSizeKey] = true;
-            window.fileSize[data.server_uuid] = data.file_size;
+            window.fileSize[data.server_hostname] = data.file_size;
 
             if (!data.content) return;
             var shouldScrollToBottom = $window.scrollTop() + $window.height() == $document.height();
             $content
-              .append('<span class="text-info">' + data.server_uuid + '</span>')
+              .append('<span class="text-info">' + data.server_hostname + '</span>')
               .append(data.content);
 
             if (shouldScrollToBottom) {

data/app/views/script/index.erb

@@ -21,6 +21,7 @@
       var data = JSON.parse(json);
       $content
         .html('<hr>')
+        .append('<span class="text-info">' + data.server_hostname + '</span>')
         .append(data.content);
     } catch (error) {
       console.log(error)

data/lib/tailog/version.rb

@@ -1,3 +1,3 @@
 module Tailog
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/tailog/watch_methods.rb

@@ -9,10 +9,14 @@ module Tailog
 
     def inject_methods targets
       targets.each do |target|
-        if target.include? "#"
-          inject_instance_method target
-        else
-          inject_class_method target
+        begin
+          if target.include? "#"
+            inject_instance_method target
+          else
+            inject_class_method target
+          end
+        rescue => error
+          WatchMethods.logger.error "Inject method `#{target}' failed: #{error.class}: #{error.message}"
         end
       end
     end
@@ -30,8 +34,6 @@ module Tailog
           #{build_watch_method target, method}
         end
       EOS
-    rescue => error
-      WatchMethods.logger.error "Inject class method `#{target}' failed: #{error.class}: #{error.message}"
     end
 
     def inject_instance_method target
@@ -39,23 +41,25 @@ module Tailog
       klass.constantize.class_eval <<-EOS, __FILE__, __LINE__
         #{build_watch_method target, method}
       EOS
-    rescue => error
-      WatchMethods.logger.error "Inject instance method `#{target}' failed: #{error.class}: #{error.message}"
     end
 
     def build_watch_method target, method
       raw_method = "watch_method_raw_#{method}"
       return <<-EOS
-        alias_method :#{raw_method}, :#{method}
-        def #{method} *args
-          Tailog::WatchMethods.logger.info "Method called: #{target} \#{self} with \#{args}"
-          start = Time.now
-          result = send :#{raw_method}, *args
-          Tailog::WatchMethods.logger.info "Method finished: #{target} with \#{result} in \#{(Time.now - start) * 1000} ms"
-          result
-        rescue => error
-          Tailog::WatchMethods.logger.error "Method failed: #{target} raises \#{error.class}: \#{error.message}\\n\#{error.backtrace.join("\\n")}"
-          raise error
+        unless instance_methods.include?(:#{raw_method})
+          alias_method :#{raw_method}, :#{method}
+          def #{method} *args
+            Tailog::WatchMethods.logger.info "Method called: #{target}, self: \#{self.inspect}, arguments: \#{args.inspect}"
+            start = Time.now
+            result = send :#{raw_method}, *args
+            Tailog::WatchMethods.logger.info "Method finished: #{target} in \#{(Time.now - start) * 1000} ms, result: \#{result.inspect}"
+            result
+          rescue => error
+            Tailog::WatchMethods.logger.error "Method failed: #{target}, error: \#{error.class} - \#{error.message}\\n\#{error.backtrace.join("\\n")}"
+            raise error
+          end
+        else
+          Tailog::WatchMethods.logger.error "Inject method `#{target}' failed: already injected"
         end
       EOS
     end

data/lib/tailog.rb

@@ -5,7 +5,7 @@ require 'tailog/ext/file'
 require 'sinatra/base'
 require 'active_support/configurable'
 
-require 'securerandom'
+require 'socket'
 require 'open3'
 require 'json'
 
@@ -13,13 +13,11 @@ module Tailog
   include ActiveSupport::Configurable
   extend Tailog::WatchMethods
 
-  config_accessor :log_path do
-    File.expand_path("log", Dir.pwd)
-  end
+  config_accessor :log_path
+  self.log_path = File.expand_path("log", Dir.pwd)
 
-  config_accessor :server_uuid do
-    SecureRandom.uuid
-  end
+  config_accessor :server_hostname
+  self.server_hostname = Socket.gethostname
 
   class App < Sinatra::Base
     set :root, File.expand_path("../../app", __FILE__)
@@ -45,7 +43,7 @@ module Tailog
         file_path = File.join Tailog.log_path, params[:file]
         file = File.open file_path
         file_size = file.size
-        tail = if seek = params[:seek] && params[:seek][Tailog.server_uuid]
+        tail = if seek = params[:seek] && params[:seek][Tailog.server_hostname]
           file.seek seek.to_i
           file
         else
@@ -58,7 +56,7 @@ module Tailog
       end
 
       {
-        server_uuid: Tailog.server_uuid,
+        server_hostname: Tailog.server_hostname,
         file_size: file_size,
         content: content
       }.to_json
@@ -76,6 +74,7 @@ module Tailog
       content = erb :"script/#{params[:type]}", locals: { script: params[:script] }, layout: false
 
       {
+        server_hostname: Tailog.server_hostname,
         content: content
       }.to_json
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tailog
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - bbtfr