rails-pretty-logger 0.2.9 → 0.3.0

data/app/views/rails/pretty/logger/dashboards/logs.html.erb

@@ -1,33 +1,52 @@
-<%= render "partials/pretyyloggernavbar", path_name: 'Hourly logs' %>
+<%= render "partials/pretyyloggernavbar", path_name: t("rails_pretty_logger.navigation.hourly_logs") %>
 
-<%= render "partials/error_pagination", log: @log, log_data: @log_data , locals: {path: "logs_dashboards_path"} %>
+<% unless rails_pretty_logger_tail_mode? %>
+  <%= render "partials/error_pagination", log: @log, log_data: @log_data , locals: {path: "logs_dashboards_path"} %>
+<% end %>
+
+<div class="form-group log-controls">
+  <div class="log-toolbar">
+    <% if rails_pretty_logger_tail_mode? %>
+      <%= link_to(t("rails_pretty_logger.logs.filtered_view"), logs_dashboards_path(rails_pretty_logger_log_filter_params(include_mode: false).merge(date_range: { start: @log.start_date, end: @log.end_date, divider: set_divider(params) }))) %>
+    <% else %>
+      <%= link_to(t("rails_pretty_logger.logs.tail_last_lines", count: Rails::Pretty::Logger::PrettyLogger.tail_lines), logs_dashboards_path(rails_pretty_logger_log_filter_params.merge(mode: "tail"))) %>
+      <% if rails_pretty_logger_request_grouping? %>
+        <%= link_to(t("rails_pretty_logger.logs.plain_lines"), logs_dashboards_path(rails_pretty_logger_log_filter_params(include_group: false).merge(date_range: { start: @log.start_date, end: @log.end_date, divider: set_divider(params) }))) %>
+      <% else %>
+        <%= link_to(t("rails_pretty_logger.logs.group_requests"), logs_dashboards_path(rails_pretty_logger_log_filter_params.merge(group: "request", date_range: { start: @log.start_date, end: @log.end_date, divider: set_divider(params) }))) %>
+      <% end %>
+    <% end %>
+  </div>
+
+  <%= render "partials/log_filters", path: "logs_dashboards_path" %>
 
-<div class="form-group">
   <%= form_for :date_range, url: logs_dashboards_path(log_file: params[:log_file]), method: :post do |f| %>
+    <%= hidden_field_tag :query, params[:query] if params[:query].present? %>
+    <%= hidden_field_tag :severity, params[:severity] if params[:severity].present? %>
+    <%= hidden_field_tag :group, params[:group] if params[:group].present? %>
     <p>
-      <%= label(:start,   :title, "Start Date:") %>
+      <%= label(:start, :title, t("rails_pretty_logger.filters.start_date")) %>
       <%= f.date_field(:start, value: @log.start_date, max: Date.today) %>
-      <%= label(:end, :title, "End Date:") %>
+      <%= label(:end, :title, t("rails_pretty_logger.filters.end_date")) %>
       <%= f.date_field(:end, value: @log.end_date, max: Date.today) %>
-      <%= label(:divider, :title, "Logs per page:") %>
+      <%= label(:divider, :title, t("rails_pretty_logger.filters.logs_per_page")) %>
       <%= f.number_field(:divider, value: set_divider(params)) %>
-      <%= f.submit "Submit" %>
+      <%= f.submit t("rails_pretty_logger.actions.submit") %>
     </p>
   <%- end%>
 
-<% if @log_data[:logs_count] > 0 %>
+<% if @log_data[:logs_count] > 0 && !rails_pretty_logger_read_only? %>
 <p>
-  <%= link_to("Clear logs",
+  <%= button_to(t("rails_pretty_logger.actions.clear_logs"),
       clear_logs_dashboards_path(log_file: params[:log_file]),
-      html_options = {class: "clear_logs",
       method: :post,
-      data: { confirm: "Are you sure to clear all logs? " }}) %>
+      class: "clear_logs",
+      form: { class: "clear_logs_form",
+      data: { turbo_confirm: t("rails_pretty_logger.confirmations.clear_all") }}) %>
 </p>
 <% end %>
 </div>
 
 <hr>
 
-<%  @log_data[:paginated_logs].each do |line| %>
-    <%= check_highlight(line) %> <br>
-<% end %>
+<%= render "partials/log_entries", log_data: @log_data %>

data/app/views/rails/pretty/logger/hourly_logs/index.html.erb

@@ -1,39 +1,63 @@
-<% if @log_file_list.count == 0 %>
-<div>
-   <h1 class="message">There is no log file to show</h1>
+<% unless @hourly_logs_present %>
+<div class="empty-state">
+   <h1 class="message"><%= t("rails_pretty_logger.states.no_logs") %></h1>
 </div>
 
 <% else %>
 
 <div class="hourly-list">
-
    <div id="hourly">
-
       <div class="logger_navbar">
-        <p>
-          <%= link_to('Main Logs',dashboards_path, html_options = {class: "dashboard_button"}) %>
-        </p>
-
+        <div class="logger_navbar__heading">
+          <h1><%= t("rails_pretty_logger.navigation.hourly_logs") %></h1>
+        </div>
 
+        <nav class="logger_navbar__actions">
+          <%= link_to(t("rails_pretty_logger.navigation.main_logs"), dashboards_path, class: "dashboard_button") %>
+        </nav>
       </div>
-      <input class="search" placeholder="Search" />
-      <button class="sort" data-sort="name">
-         Sort
-      </button>
-      <ul class="pagination"></ul>
 
-      <ul class="list">
-         <% @log_file_list .each do |key, value| %>
-         <li>
-            <h5 class="name">
-               <%= link_to(modify_name(value.fetch(:file_name)),
-               logs_hourly_logs_path(log_file: value.fetch(:file_name), date_range: { start: time_now, end: time_now }),
-               html_options = {class: "dashboard_button",
-               data: { confirm: "Log file size is #{ value.fetch(:file_size) } MB. Are you sure to open this file? " }}) %>
-            </h5>
-            <% end %>
-         </li>
+      <%= form_with url: hourly_logs_path, method: :get, scope: nil, class: "hourly_filters filter-panel" do |form| %>
+         <%= form.label :search, t("rails_pretty_logger.filters.search") %>
+         <%= form.search_field :search, value: params[:search], placeholder: t("rails_pretty_logger.filters.search"), class: "search" %>
+         <%= form.hidden_field :sort, value: params[:sort] %>
+         <%= form.submit t("rails_pretty_logger.filters.search") %>
+         <%= link_to(t("rails_pretty_logger.actions.sort", direction: params[:sort] == "desc" ? "asc" : "desc"),
+            hourly_logs_path(search: params[:search], sort: params[:sort] == "desc" ? "asc" : "desc"),
+            class: "sort") %>
+      <% end %>
+
+      <% if @log_file_list.empty? %>
+         <div class="empty-state empty-state--inline">
+            <h1 class="message"><%= t("rails_pretty_logger.states.no_logs") %></h1>
+         </div>
+      <% end %>
+
+      <ul class="list log-file-list">
+         <% @log_file_list.each do |value| %>
+            <li class="log-file-row">
+               <div class="log-file-row__main">
+                  <%= link_to(modify_name(value.fetch(:file_name)),
+                  logs_hourly_logs_path(log_file: value.fetch(:file_name), date_range: { start: time_now, end: time_now }),
+                  html_options = {class: "name log-file-row__name",
+                  data: { confirm: t("rails_pretty_logger.confirmations.open_file", size: value.fetch(:file_size)) }}) %>
+                  <span class="log-file-row__meta"><%= t("rails_pretty_logger.logs.file_size", size: value.fetch(:file_size)) %></span>
+               </div>
+            </li>
+         <% end %>
       </ul>
+
+      <% if @total_pages > 1 %>
+         <ul class="pagination">
+            <% 1.upto(@total_pages) do |page| %>
+               <li>
+                  <%= link_to page,
+                     hourly_logs_path(search: params[:search], sort: params[:sort], page: page),
+                     class: ("active" if page == @page) %>
+               </li>
+            <% end %>
+         </ul>
+      <% end %>
    </div>
 </div>
 <% end %>

data/app/views/rails/pretty/logger/hourly_logs/logs.html.erb

@@ -1,35 +1,56 @@
 <div class="logger_navbar">
-  <p>
-    <%= link_to('Main Logs',dashboards_path, html_options = {class: "dashboard_button"}) %>
-    <%= link_to('Hourly Logs ', hourly_logs_path, html_options = {class: "dashboard_button"}) %>
-  </p>
+  <div class="logger_navbar__heading">
+    <h1><%= t("rails_pretty_logger.navigation.hourly_logs") %></h1>
+  </div>
+
+  <nav class="logger_navbar__actions">
+    <%= link_to(t("rails_pretty_logger.navigation.main_logs"), dashboards_path, class: "dashboard_button") %>
+    <%= link_to(t("rails_pretty_logger.navigation.hourly_logs"), hourly_logs_path, class: "dashboard_button") %>
+  </nav>
 </div>
-<hr>
+
 <% if  @log_data[:logs_count] > 0 %>
 
+<% unless rails_pretty_logger_tail_mode? %>
 <%= render "partials/error_pagination", log: @log, log_data: @log_data, locals: {path: "logs_hourly_logs_path"} %>
+<% end %>
 
-  <% if @log_data[:logs_count] > 0 %>
+<div class="form-group log-controls">
+  <div class="log-toolbar">
+    <% if rails_pretty_logger_tail_mode? %>
+      <%= link_to(t("rails_pretty_logger.logs.filtered_view"), logs_hourly_logs_path(rails_pretty_logger_log_filter_params(include_mode: false).merge(date_range: { start: @log.start_date, end: @log.end_date, divider: set_divider(params) }))) %>
+    <% else %>
+      <%= link_to(t("rails_pretty_logger.logs.tail_last_lines", count: Rails::Pretty::Logger::PrettyLogger.tail_lines), logs_hourly_logs_path(rails_pretty_logger_log_filter_params.merge(mode: "tail"))) %>
+      <% if rails_pretty_logger_request_grouping? %>
+        <%= link_to(t("rails_pretty_logger.logs.plain_lines"), logs_hourly_logs_path(rails_pretty_logger_log_filter_params(include_group: false).merge(date_range: { start: @log.start_date, end: @log.end_date, divider: set_divider(params) }))) %>
+      <% else %>
+        <%= link_to(t("rails_pretty_logger.logs.group_requests"), logs_hourly_logs_path(rails_pretty_logger_log_filter_params.merge(group: "request", date_range: { start: @log.start_date, end: @log.end_date, divider: set_divider(params) }))) %>
+      <% end %>
+    <% end %>
+  </div>
+
+  <%= render "partials/log_filters", path: "logs_hourly_logs_path" %>
+
+  <% if @log_data[:logs_count] > 0 && !rails_pretty_logger_read_only? %>
     <p>
-      <%= link_to("Clear logs",
+      <%= button_to(t("rails_pretty_logger.actions.clear_logs"),
           clear_logs_hourly_logs_path(log_file: params[:log_file]),
-          html_options = {class: "clear_logs",
           method: :post,
-          data: { confirm: "Are you sure to clear all logs? " }}) %>
+          class: "clear_logs",
+          form: { class: "clear_logs_form",
+          data: { turbo_confirm: t("rails_pretty_logger.confirmations.clear_all") }}) %>
     </p>
   <% end %>
 </div>
 
 
-  <hr>
+<hr>
 
-  <%  @log_data[:paginated_logs].each do |line| %>
-      <%= check_highlight(line) %> <br>
-  <% end %>
+<%= render "partials/log_entries", log_data: @log_data %>
 
 <% else %>
 
   <div>
-    <h1 class="message">There is no log file to show</h1>
+    <h1 class="message"><%= t("rails_pretty_logger.states.no_logs") %></h1>
   </div>
 <% end %>

data/config/locales/rails_pretty_logger.en.yml

@@ -0,0 +1,35 @@
+en:
+  rails_pretty_logger:
+    actions:
+      clear: "Clear"
+      clear_logs: "Clear logs"
+      sort: "Sort %{direction}"
+      submit: "Submit"
+    confirmations:
+      clear_all: "Are you sure to clear all logs?"
+      clear_file: "Are you sure to clear all logs from %{file}?"
+      open_file: "Log file size is %{size} MB. Are you sure to open this file?"
+    filters:
+      clear_filters: "Clear filters"
+      end_date: "End Date:"
+      filter: "Filter"
+      logs_per_page: "Logs per page:"
+      search: "Search"
+      search_log_content: "Search log content"
+      severity: "Severity"
+      start_date: "Start Date:"
+    logs:
+      file_size: "%{size} MB"
+      filtered_view: "Filtered view"
+      group_requests: "Group requests"
+      plain_lines: "Plain lines"
+      tail_last_lines: "Tail last %{count} lines"
+      ungrouped_lines: "Ungrouped lines"
+    navigation:
+      hourly_logs: "Hourly logs"
+      log_files: "Log files"
+      main_logs: "Main logs"
+      pagination: "Pagination"
+    states:
+      no_logs: "There is no log file to show"
+      stdout_logging: "RAILS_LOG_TO_STDOUT is present. No logs are being kept."

data/config/locales/rails_pretty_logger.tr.yml

@@ -0,0 +1,35 @@
+tr:
+  rails_pretty_logger:
+    actions:
+      clear: "Temizle"
+      clear_logs: "Logları temizle"
+      sort: "%{direction} sırala"
+      submit: "Gönder"
+    confirmations:
+      clear_all: "Tüm logları temizlemek istediğine emin misin?"
+      clear_file: "%{file} dosyasındaki tüm logları temizlemek istediğine emin misin?"
+      open_file: "Log dosyası %{size} MB. Bu dosyayı açmak istediğine emin misin?"
+    filters:
+      clear_filters: "Filtreleri temizle"
+      end_date: "Bitiş tarihi:"
+      filter: "Filtrele"
+      logs_per_page: "Sayfa başına log:"
+      search: "Ara"
+      search_log_content: "Log içeriğinde ara"
+      severity: "Seviye"
+      start_date: "Başlangıç tarihi:"
+    logs:
+      file_size: "%{size} MB"
+      filtered_view: "Filtrelenmiş görünüm"
+      group_requests: "İstekleri grupla"
+      plain_lines: "Düz satırlar"
+      tail_last_lines: "Son %{count} satır"
+      ungrouped_lines: "Gruplanmamış satırlar"
+    navigation:
+      hourly_logs: "Saatlik loglar"
+      log_files: "Log dosyaları"
+      main_logs: "Ana loglar"
+      pagination: "Sayfalama"
+    states:
+      no_logs: "Gösterilecek log dosyası yok"
+      stdout_logging: "RAILS_LOG_TO_STDOUT mevcut. Log dosyası tutulmuyor."

data/lib/generators/rails_pretty_logger/install/install_generator.rb

@@ -0,0 +1,29 @@
+require "rails/generators"
+
+module RailsPrettyLogger
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      JAVASCRIPT_MANIFEST_LINK = "//= link rails/pretty/logger/application.js".freeze
+
+      source_root File.expand_path("templates", __dir__)
+
+      def copy_initializer
+        template "rails_pretty_logger.rb", "config/initializers/rails_pretty_logger.rb"
+      end
+
+      def mount_engine
+        route %(mount Rails::Pretty::Logger::Engine => "/rails-pretty-logger")
+      end
+
+      def link_javascript_asset
+        manifest = "app/assets/config/manifest.js"
+        manifest_path = File.join(destination_root, manifest)
+        return unless File.exist?(manifest_path)
+        return if File.read(manifest_path).include?(JAVASCRIPT_MANIFEST_LINK)
+
+        separator = File.read(manifest_path).end_with?("\n") ? "" : "\n"
+        append_to_file manifest, "#{separator}#{JAVASCRIPT_MANIFEST_LINK}\n"
+      end
+    end
+  end
+end

data/lib/generators/rails_pretty_logger/install/templates/rails_pretty_logger.rb

@@ -0,0 +1,20 @@
+Rails::Pretty::Logger.configure do |config|
+  # The hook runs inside the Rails Pretty Logger engine controller.
+  # Example for apps that expose authenticate_user!:
+  # config.authenticate_with = -> { authenticate_user! }
+  config.authenticate_with = nil
+
+  # Production dashboards should usually be read-only unless clearing logs is explicitly desired.
+  config.read_only = Rails.env.production?
+
+  # Set to nil to allow any log file size.
+  config.max_file_size = 50.megabytes
+
+  # Number of lines shown by the tail view.
+  config.tail_lines = 500
+
+  # Optional parser for custom log formats. Return nil for lines the parser does not handle.
+  # Supported keys include :timestamp, :severity, :request_method, :request_path,
+  # :request_ip, :response_status, and :duration.
+  # config.log_line_parser = ->(line) { nil }
+end

data/lib/rails/pretty/logger/active_support_logger.rb

@@ -5,11 +5,7 @@ module Rails::Pretty::Logger
 
   class ActiveSupportLogger < RailsLogger
     include ActiveSupport::LoggerThreadSafeLevel
-    if Rails::VERSION::MAJOR < 6.0
-      include LoggerSilence
-    else
-      include ActiveSupport::LoggerSilence
-    end 
+    include ActiveSupport::LoggerSilence
 
     # Returns true if the logger destination matches one of the sources
     #
@@ -80,8 +76,8 @@ module Rails::Pretty::Logger
       end
     end
 
-    def initialize(*args)
-      super
+    def initialize(*args, **kwargs)
+      super(*args, **kwargs)
       @formatter = SimpleFormatter.new
       after_initialize if respond_to? :after_initialize
     end

data/lib/rails/pretty/logger/config/logger_config.rb

@@ -1,17 +1 @@
 require "rails/pretty/logger/console_logger"
-require "rails/pretty/logger/active_support_logger"
-
-
-module Rails
-  module Pretty
-    module Logger
-      module Config
-
-        class LoggerConfig < Rails::Application
-
-        end
-        
-      end
-    end
-  end
-end

data/lib/rails/pretty/logger/configuration.rb

@@ -0,0 +1,18 @@
+module Rails::Pretty::Logger
+  class Configuration
+    attr_accessor :authenticate_with, :log_line_parser, :max_file_size, :tail_lines
+    attr_writer :read_only
+
+    def initialize
+      @authenticate_with = nil
+      @log_line_parser = nil
+      @read_only = Rails.env.production?
+      @max_file_size = nil
+      @tail_lines = 500
+    end
+
+    def read_only?
+      @read_only == true
+    end
+  end
+end

data/lib/rails/pretty/logger/console_logger.rb

@@ -5,8 +5,8 @@ module Rails::Pretty::Logger
   
   class ConsoleLogger < ActiveSupportLogger
 
-    def initialize(*args)
-      super(*args)
+    def initialize(*args, **kwargs)
+      super(*args, **kwargs)
       @formatter = ConsoleFormatter.new
     end
   end

data/lib/rails/pretty/logger/engine.rb

@@ -3,11 +3,29 @@ module Rails
     module Logger
       class Engine < ::Rails::Engine
         isolate_namespace Rails::Pretty::Logger
-        ActiveSupport.on_load(:action_controller) do
-          include Rails::Pretty::Logger
+
+        initializer "rails_pretty_logger.assets" do |app|
+          assets_config = app.config.assets if app.config.respond_to?(:assets)
+
+          if assets_config.respond_to?(:paths) && assets_config.respond_to?(:precompile)
+            %w[stylesheets javascripts].each do |asset_path|
+              path = root.join("app/assets", asset_path).to_s
+              assets_config.paths << path unless assets_config.paths.include?(path)
+            end
+
+            %w[
+              rails/pretty/logger/application.js
+              rails/pretty/logger/application.css
+              rails/pretty/logger/dashboards.css
+              rails/pretty/logger/list.css
+            ].each do |asset|
+              assets_config.precompile << asset unless assets_config.precompile.include?(asset)
+            end
+          end
         end
-        initializer "rails-pretty-logger.assets.precompile" do |app|
-          app.config.assets.precompile += %w( rails/pretty/logger/application.css rails/pretty/logger/application.js)
+
+        rake_tasks do
+          load root.join("lib/tasks/rails/pretty/logger_tasks.rake")
         end
       end
     end

data/lib/rails/pretty/logger/rails_logger.rb

@@ -1,4 +1,7 @@
 
+require "fileutils"
+require "logger"
+
 module Rails::Pretty::Logger
 
   class RailsLogger < ::Logger
@@ -7,14 +10,10 @@ module Rails::Pretty::Logger
       progname: nil, formatter: nil, datetime_format: nil,
       shift_period_suffix: '%Y%m%d')
 
-      self.level = level
-      self.progname = progname
-      @default_formatter = Formatter.new
-      self.datetime_format = datetime_format
-      self.formatter = formatter
+      super(nil, level: level, progname: progname, formatter: formatter, datetime_format: datetime_format)
       @logdev = nil
       if logdev
-        log_name = "log/" + logdev + ".log"
+        log_name = Rails.root.join("log", "#{logdev}.log").to_s
         @logdev = LoggerDevice.new(log_name, :shift_age => shift_age,
           :shift_size => shift_size,
           :shift_period_suffix => shift_period_suffix, file_count: file_count )
@@ -95,48 +94,70 @@ module Rails::Pretty::Logger
         end
 
         def shift_log_period(period_end)
-          suffix = period_end.strftime(@shift_period_suffix)
+          with_rotation_lock do
+            suffix = period_end.strftime(@shift_period_suffix)
+
+            suffix_year = period_end.strftime('%Y')
+            suffix_month = period_end.strftime('%m')
+            suffix_day = period_end.strftime('%d')
+
+            if @shift_age == 'hourly'
+              suffix = period_end.strftime('%Y%m%d_%H%M')
+            end
 
-          suffix_year = period_end.strftime('%Y')
-          suffix_month = period_end.strftime('%m')
-          suffix_day = period_end.strftime('%d')
+            age_file = available_log_path("#{@filename}.#{suffix}")
+
+            @dev.close rescue nil
+
+            File.rename("#{@filename}", age_file)
+            new_path = File.join(Rails.root, 'log', 'hourly', suffix_year, suffix_month, suffix_day)
+            FileUtils.mkdir_p new_path
+            destination = available_log_path(File.join(new_path, File.basename(age_file)))
+            FileUtils.mv age_file, destination
+            delete_old_hourly_files
+            @dev = create_logfile(@filename)
+            true
+          end
+        end
 
-          if @shift_age == 'hourly'
-            suffix = period_end.strftime('%Y%m%d_%H%M')
+        def with_rotation_lock
+          FileUtils.mkdir_p(File.dirname(rotation_lock_path))
+          File.open(rotation_lock_path, File::RDWR | File::CREAT, 0644) do |lock|
+            lock.flock(File::LOCK_EX)
+            yield
           end
+        end
 
-          age_file = "#{@filename}.#{suffix}"
+        def rotation_lock_path
+          Rails.root.join("tmp", "rails_pretty_logger", "#{File.basename(@filename)}.rotate.lock").to_s
+        end
 
-          if FileTest.exist?(age_file)
-            # try to avoid filename crash caused by Timestamp change.
-            idx = 0
-            # .99 can be overridden; avoid too much file search with 'loop do'
-            while idx < 100
-              idx += 1
-              age_file = "#{@filename}.#{suffix}.#{idx}"
-              break unless FileTest.exist?(age_file)
-            end
+        def available_log_path(path)
+          candidate = path
+          index = 0
+          while File.exist?(candidate)
+            index += 1
+            candidate = "#{path}.#{index}"
           end
+          candidate
+        end
 
-          #delete old files
-          log_files = Dir[ File.join(Rails.root, 'log', 'hourly') + "/#{suffix_year}/**/*"].reject {|fn| File.directory?(fn) }
-          while (log_files.length > @file_count) do
-            arr = log_files.reduce([]){|memo, log_file| memo <<  File.ctime(log_file).to_i}
-            file_index = arr.index(arr.min)
-            file_path = log_files[file_index]
-            delete_old_file(file_path)
-            log_files = Dir[ File.join(Rails.root, 'log', 'hourly') + "/#{suffix_year}/**/*"].reject {|fn| File.directory?(fn) }
+        def delete_old_hourly_files
+          log_files = hourly_log_files
+          while log_files.length > @file_count
+            delete_old_file(log_files.min_by { |log_file| hourly_log_sort_key(log_file) })
+            log_files = hourly_log_files
           end
+        end
 
-          @dev.close rescue nil
+        def hourly_log_files
+          log_prefix = "#{File.basename(@filename)}."
+          Dir[File.join(Rails.root, 'log', 'hourly', '**', '*')]
+            .select { |file| File.file?(file) && File.basename(file).start_with?(log_prefix) }
+        end
 
-          File.rename("#{@filename}", age_file)
-          old_log_path = Rails.root.join(age_file)
-          new_path = File.join(Rails.root, 'log', 'hourly', suffix_year, suffix_month, suffix_day)
-          FileUtils.mkdir_p new_path
-          FileUtils.mv old_log_path, new_path, :force => true
-          @dev = create_logfile(@filename)
-          return true
+        def hourly_log_sort_key(file)
+          File.basename(file)[/\.([0-9]{8}_[0-9]{4})(?:\.[0-9]+)?\z/, 1] || File.mtime(file).utc.strftime("%Y%m%d_%H%M")
         end
 
         def delete_old_file(file_path)
@@ -144,9 +165,9 @@ module Rails::Pretty::Logger
           month_dir = File.expand_path("..",day_dir)
           year_dir = File.expand_path("../..",day_dir)
           File.delete(file_path) if File.exist?(file_path)
-          Dir.rmdir(day_dir) if Dir.empty?(day_dir)
-          Dir.rmdir(month_dir) if month_dir.empty?
-          Dir.rmdir(year_dir) if year_dir.empty?
+          Dir.rmdir(day_dir) if Dir.exist?(day_dir) && Dir.empty?(day_dir)
+          Dir.rmdir(month_dir) if Dir.exist?(month_dir) && Dir.empty?(month_dir)
+          Dir.rmdir(year_dir) if Dir.exist?(year_dir) && Dir.empty?(year_dir)
         end
       end
 

data/lib/rails/pretty/logger/version.rb

@@ -1,7 +1,7 @@
 module Rails
   module Pretty
     module Logger
-      VERSION = '0.2.9'
+      VERSION = "0.3.0"
     end
   end
 end