httpthumbnailer in httpthumbnailer-0.0.13

- old
+ new

@@ -4,12 +4,12 @@
 require 'ip'
 
 options = CLI.new do
 	description 'HTTP thumbnailing server'
 	switch :no_bind, :description => "Do not bind to TCP socket - useful with -s fastcgi option"
-	switch :no_logging, :description => "Disables logging"
-	switch :debug, :description => "Enables debugging"
+	switch :no_logging, :description => "Disable logging"
+	switch :debug, :description => "Enable debugging"
 	option :bind, :short => :b, :default => IP.new('127.0.0.1'), :cast => IP, :description => "HTTP server bind address - use 0.0.0.0 to bind to all interfaces"
 	option :port, :short => :p, :default => 3100, :cast => Integer, :description => "HTTP server TCP port"
 	option :server, :short => :s, :default => 'mongrel', :description => "Rack server handler like thin, mongrel, webrick, fastcgi etc."
 	option :limit_memory, :default => 128*1024**2, :cast => Integer, :description => "Image cache heap memory size limit in bytes"
 	option :limit_map, :default => 256*1024**2, :cast => Integer, :description => "Image cache memory mapped file size limit in bytes - used when heap memory limit is used up"
@@ -42,10 +42,10 @@
 sinatra.set :limit_memory, options.limit_memory
 sinatra.set :limit_map, options.limit_map
 sinatra.set :limit_disk, options.limit_disk
 
 sinatra.before do
-	logger.level = Logger::DEBUG if settings.debug == true
+	logger.level = Logger::DEBUG if settings.logging and settings.debug
 	if $thumbnailer.nil? 
 		$thumbnailer = Thumbnailer.new(:logger => logger, :limit_memory => settings.limit_memory, :limit_map => settings.limit_map, :limit_disk => settings.limit_disk)
 
 		$thumbnailer.method('crop') do |image, spec|
 			image.resize_to_fill!(spec.width, spec.height)