Merge branch 'master' of github.com:neocities/neocities

e is necessary,

Rakefile

@@ -15,7 +15,7 @@ task :default => :test
 
 desc "parse logs"
 task :parse_logs => [:environment] do
-  Dir["/home/web/proxy/logs/*.log"].each do |log_path|
+  Dir[File.join($config['logs_path'], '*.log')].each do |log_path|
     hits = {}
     visits = {}
     visit_ips = {}
@@ -196,7 +196,10 @@ task :rebuild_thumbnails => [:environment] do
     path = '/'+full_path[1..full_path.length].join('/')
 
     if Pathname(path).extname.gsub('.', '').match Site::IMAGE_REGEX
+      begin
         ThumbnailWorker.new.perform username, path
+      rescue Magick::ImageMagickError
+      end
     end
   end
 end