apache_log_report 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4cd01d24bc31eb2fe1107781a94578b43210fdc7d63dd65190643e637dc8da1
-  data.tar.gz: f1889cc37617847862274bd3d65fab82662d5c8e988129a227ed80b1fe4b7887
+  metadata.gz: 742584032338664834cd5c1b669289980e083e68d172827f6517ce040543aa4d
+  data.tar.gz: 1bf08e255feb434ded62589d5c70ea5a6eb83dc1f6a69e60a31cb520eea6b48f
 SHA512:
-  metadata.gz: 520c9648ccd15f9a3bc0b1761989bb091bc81cf7f16eac6cf5bc5bb73c0aef3e47a03eafd85f468c08834dbf93163c4b750ef31d61b63d277f546afcd21082b2
-  data.tar.gz: a1833663a335da90513d1054117b9ca39b2f9802c021f7f75dda929312c00e32e7a3725901454c3a3f583839d0addbf511f08e421117f2317892fe1fe1f93628
+  metadata.gz: 955dbe90321c68f5694aaa892cae97926172ca47b684a0eee1b9f7644dc26a13f853b3b3d20e35cf06872b29db0c06bc16c4c86e69c740ea86fe8768ae92b2a1
+  data.tar.gz: e6d9ebc88435442bfb77faa3cb2eccb94a355e9ca7af44548a7b443531c9fae923e41f5d97201044f71414f2d9894162b593cd15170e255030ab49bd9992e3f0

data/README.org

@@ -4,6 +4,8 @@
 
 * Introduction
 
+ApacheLogReport is an Apache log analyzer.
+
 * Installation
 
 * Usage
@@ -14,8 +16,12 @@ See the [[file:CHANGELOG.org][CHANGELOG]] file.
 
 * Todo
 
+** TODO Referers should only include the hostname?
 ** TODO Graphs in HTML output
 ** TODO Countries
+** TODO Light and Dark Theme
+** TODO Embed CSS
+** TODO Declare datatypes in table outputs, so that we can format data
 
 * Compatibility
 

data/lib/apache_log_report/data_cruncher.rb

@@ -1,17 +1,41 @@
+
 module ApacheLogReport
   module DataCruncher
 
     #
     # take a sqlite3 database and analyze data
     #
+    # @ variables are automatically put in the returned data
+    #
 
     def self.crunch db, options = {}
-      @first_day      = db.execute "SELECT datetime from LogLine order by datetime limit 1"
-      @last_day       = db.execute "SELECT datetime from LogLine order by datetime desc limit 1"
+      first_day_s = db.execute "SELECT datetime from LogLine order by datetime limit 1"
+      last_day_s  = db.execute "SELECT datetime from LogLine order by datetime desc limit 1"
+
+      # make first and last day into dates or nil
+      @first_day = first_day_s.empty? ? nil : Date.parse(first_day_s[0][0])
+      @last_day = last_day_s.empty? ? nil : Date.parse(last_day_s[0][0])
+
+      @total_days = 0
+      if @first_day and @last_day
+        @total_days = (@last_day - @first_day).to_i
+      end
+
       @log_size       = db.execute "SELECT count(datetime) from LogLine"
       @crawlers_size  = db.execute "SELECT count(datetime) from LogLine where bot == 1"
       @selfpolls_size = db.execute "SELECT count(datetime) from LogLine where ip == '::1'"
 
+      @first_day_requested = options[:from_date]
+      @last_day_requested = options[:to_date]
+
+      @first_day_in_analysis = date_intersect options[:from_date], @first_day, :max
+      @last_day_in_analysis = date_intersect options[:to_date], @last_day, :min
+
+      @total_days_in_analysis = 0
+      if @first_day_in_analysis and @last_day_in_analysis
+        @total_days_in_analysis = (@last_day_in_analysis - @first_day_in_analysis).to_i
+      end
+
       #
       # generate the where clause corresponding to the command line options to filter data
       #
@@ -54,7 +78,6 @@ module ApacheLogReport
       @total_hits = db.execute "SELECT count(datetime) from LogLine where #{filter}"
       @total_unique_visitors = db.execute "SELECT count(distinct(unique_visitor)) from LogLine where #{filter}"
       @total_size = db.execute "SELECT #{human_readable_size} from LogLine where #{filter}"
-      @total_days = (Date.parse(@last_day[0][0]) - Date.parse(@first_day[0][0])).to_i
 
       @daily_distribution = db.execute "SELECT date(datetime), #{human_readable_day}, count(datetime), count(distinct(unique_visitor)), #{human_readable_size} from LogLine  where #{filter} group by date(datetime)"
       @time_distribution = db.execute "SELECT strftime('%H', datetime), count(datetime), count(distinct(unique_visitor)), #{human_readable_size} from LogLine  where #{filter} group by strftime('%H', datetime)"
@@ -92,7 +115,20 @@ module ApacheLogReport
       end
       data
     end
-  end
 
+    private
+
+    def self.date_intersect date1, date2, method
+      if date1 and date2
+        [date1, date2].send(method)
+      elsif date1
+        date1
+      else
+        date2
+      end
+    end
+
+
+  end
 end
 

data/lib/apache_log_report/options_parser.rb

@@ -18,11 +18,11 @@ module ApacheLogReport
           args[:limit] = n
         end
 
-        opts.on("-bDATE", "--begin=DATE", DateTime, "Consider entries after or on DATE") do |n|
+        opts.on("-bDATE", "--begin=DATE", Date, "Consider entries after or on DATE") do |n|
           args[:from_date] = n
         end
 
-        opts.on("-eDATE", "--end=DATE", DateTime, "Consider entries before or on DATE") do |n|
+        opts.on("-eDATE", "--end=DATE", Date, "Consider entries before or on DATE") do |n|
           args[:to_date] = n
         end
 

data/lib/apache_log_report/templates/template.html.erb

@@ -31,7 +31,9 @@
                 "Browsers",
                 "Platforms",
                 "Referers",
-                "IPs"
+                "IPs",
+                "Command Invocation",
+                "Performance"
               ].each do |item| %>
                 <li class="nav-item">
                   <a href="#<%= item.downcase.gsub(' ', '-') %>"><%= item %></a>
@@ -40,6 +42,14 @@
             </ul>
           </li>
         </ul>
+        <p>
+          Generated by<br />
+          <a href="https://www.ict4g.net/gitea/adolfo/apache_log_report">
+            Apache Log Report
+          </a> <br />
+          on <%= DateTime.now.strftime("%Y-%m-%d %H:%M") %>.<br />
+          The lean log analyzer.
+        </p>
       </nav>
 
       <section>
@@ -50,6 +60,22 @@
             <h2 id="summary">Summary</h2>
 
             <table class="table summary">
+              <tr>
+                <th>Input file</th>
+                <td><b><%= (data[:log_file] || "stdin") %></b></td>
+              </tr>
+              <tr>
+                <th class="period">Period Analyzed</th>
+                <td class="period">
+                  <%= data[:first_day_in_analysis] %>
+                  --
+                  <%= data[:last_day_in_analysis] %>
+                </td>
+              </tr>
+              <tr>
+                <th class="days">Days </th>
+                <td class="days"><%= data[:total_days_in_analysis] %></td>
+              </tr>
               <tr>
                 <th class="hits">Hits</th>
                 <td class="hits"><%= data[:total_hits][0][0] %></td>
@@ -62,18 +88,6 @@
                 <th class="tx">Tx</th>
                 <td class="tx"><%= data[:total_size][0][0] %></td>
               </tr>
-              <tr>
-                <th class="period">Period</th>
-                <td class="period">
-                  <%= data[:first_day][0][0] %>
-                  --
-                  <%= data[:last_day][0][0] %>
-                </td>
-              </tr>
-              <tr>
-                <th class="days">Days </th>
-                <td class="days"><%= data[:total_days] %></td>
-              </tr>
             </table>
           </article>
           <article class="column col-6">
@@ -85,6 +99,14 @@
                   <th>Input file</th>
                   <td><b><%= (data[:log_file] || "stdin") %></b></td>
                 </tr>
+                <tr>
+                  <th>Period in Log</th>
+                  <td><%= data[:first_day] %> -- <%= data[:last_day] %></td>
+                </tr>
+                <tr>
+                  <th>Total days</th>
+                  <td><%= data[:total_days] %></td>
+                </tr>
                 <tr>
                   <th>Log size</th>
                   <td><%= data[:log_size][0][0] %></td>
@@ -175,7 +197,7 @@
                 <tbody>
                   <tr>
                     <th>CLI Command</th>
-                    <td><pre><%= data[:command] %></pre></td>
+                    <td><code><%= data[:command] %></code></td>
                   </tr>
                   <tr>
                     <th>Input file</th>

data/lib/apache_log_report/templates/template.org.erb

@@ -10,7 +10,11 @@
 | Hits                | <%= "%10d" % data[:total_hits][0][0] %> |
 | Unique Visitors     | <%= "%10d" % data[:total_unique_visitors][0][0]  %> |
 | Tx                  | <%= "%10s" % data[:total_size][0][0] %> |
-| Days                | <%= "%10d" % data[:total_days][0][0]  %> |
+| Logged Period       | <%= data[:first_day]  %> -- <%= data[:last_day] %> |
+| Days                | <%= "%10d" % data[:total_days]  %> |
+| Period Requested    | <%= data[:first_day_requested] %> -- <%= data[:last_day_requested] %> |
+| Period Analyzed     | <%= data[:first_day_in_analysis] %> -- <%= data[:last_day_in_analysis] %> |
+| Days in Analysis    | <%= data[:total_days_in_analysis] %> |
 
 * Daily Distribution
 

data/lib/apache_log_report/version.rb

@@ -1,3 +1,3 @@
 module ApacheLogReport
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apache_log_report
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Adolfo Villafiorita