heel 0.3.2 → 0.4.0

data/CHANGES

@@ -1,4 +1,7 @@
 = Changelog
+== Version 0.4.0 - 2007-11-04
+
+* Added common log format output to terminal or logfile as appropriate.
 
 == Version 0.3.2 - 2007-08-30
 
@@ -10,7 +13,7 @@
 * fix failure to find pid file [Bug #13530]
 * remember to stop releasing software in the wee hours of the morning
 
-=== Version 0.3.0 
+=== Version 0.3.0 - 2007-08-30
 
 * update with Launchy requirement 0.3.0
 * remove unneeded famfamfam icons

data/lib/heel/dir_handler.rb

@@ -185,11 +185,12 @@ module Heel
             end
 
             entries = entries.sort_by { |e| e.link }
-
+            res_bytes = 0
             response.start(200) do |head,out|
                 head['Content-Type'] = 'text/html'
-                out.write(template.result(binding))
+                res_bytes = out.write(template.result(binding))
             end
+            return res_bytes
         end
 
         # this method is essentially the send_file method from
@@ -229,6 +230,7 @@ module Heel
             if method == ::Mongrel::Const::GET then
                 response.send_file(path,stat.size < ::Mongrel::Const::CHUNK_SIZE * 2)
             end
+            return stat.size
         end
 
         # process the request, returning either the file, a directory
@@ -243,20 +245,30 @@ module Heel
                                                       ::Mongrel::HttpRequest.unescape(request.params[Mongrel::Const::PATH_INFO])),
                                             @document_root)
                 res_type = how_to_respond(req_path)
-
+                res_size = 0
+                
                 case res_type 
                 when :directory_listing
-                    respond_with_directory_listing(req_path,request,response)
+                    res_size = respond_with_directory_listing(req_path,request,response)
                 when String
-                    respond_with_send_file(res_type,method,request,response)
+                    res_size = respond_with_send_file(res_type,method,request,response)
                 when Integer
                     response.status = res_type
                 end
+                
 
             # invalid method
             else
                 response.start(403) { |head,out| out.write("Only HEAD and GET requests are honored.") }
             end
+            log_line = [ request.params[Mongrel::Const::REMOTE_ADDR], "-", "-", "[#{Time.now.strftime("%d/%b/%Y:%H:%M:%S %Z")}]" ]
+            log_line << "\"#{method}"
+            log_line << request.params['REQUEST_URI']
+            log_line << "#{request.params['HTTP_VERSION']}\""
+            log_line << response.status
+            log_line << res_size
+            
+            log log_line.join(' ')            
         end
 
         # essentially this is strfbytes from facets
@@ -278,7 +290,7 @@ module Heel
         end
 
         def log(msg)
-            STDERR.print "-->  ", msg, "\n"
+            STDERR.print msg, "\n"
         end
     end
 end

data/lib/heel/server.rb

@@ -196,7 +196,7 @@ module Heel
                     if File.exists?(c_pid_file) then
                         log "ERROR: PID File #{c_pid_file} already exists.  Heel may already be running."
                         log "ERROR: Check the Log file #{c_log_file}"
-                        log "ERROR: Heel will not start until the .pid file is cleared."
+                        log "ERROR: Heel will not start until the .pid file is cleared (`heel --kill' to clean it up)."
                         exit 1
                     end
                     daemonize({:cwd => c_default_dir, :log_file => c_log_file})

data/lib/heel/version.rb

@@ -3,8 +3,8 @@ require 'heel'
 module Heel
     class Version
         MAJOR   = 0 
-        MINOR   = 3 
-        BUILD   = 2 
+        MINOR   = 4 
+        BUILD   = 0 
 
         class << self
             def to_a

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: heel
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
-date: 2007-08-30 00:00:00 -06:00
+  version: 0.4.0
+date: 2007-11-04 00:00:00 -04:00
 summary: A mongrel based static file webserver.
 require_paths: 
 - lib