Download as
Browse Code »

Commit db02d002d35b37094d6ebfed0df3565158591d48

Authored by Rodrigo Souto
2 parents d6f86b4d 9863d3e9
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge commit 'refs/merge-requests/280' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/280
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
app/models/spammer_logger.rb
  Diff comments   View file @db02d00
@@ -5,10 +5,10 @@ class SpammerLogger < Logger @@ -5,10 +5,10 @@ class SpammerLogger < Logger
5 def self.log(spammer_ip, object=nil) 5 def self.log(spammer_ip, object=nil)
6 if object 6 if object
7 if object.kind_of?(Comment) 7 if object.kind_of?(Comment)
8 - @logger << "[#{Time.now.strftime("%F %T %z")}] Comment-id: #{object.id} IP: #{spammer_ip}\n" 8 + @logger << "[#{Time.now.strftime('%F %T %z')}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
9 end 9 end
10 else 10 else
11 - @logger << "[#{Time.now.strftime("%F %T %z")}] IP: #{spammer_ip}\n" 11 + @logger << "[#{Time.now.strftime('%F %T %z')}] IP: #{spammer_ip}\n"
12 end 12 end
13 end 13 end
14 14
plugins/spaminator/lib/spaminator_plugin/spaminator.rb
  Diff comments   View file @db02d00
@@ -15,12 +15,12 @@ class SpaminatorPlugin::Spaminator @@ -15,12 +15,12 @@ class SpaminatorPlugin::Spaminator
15 def initialize_logger(environment) 15 def initialize_logger(environment)
16 logdir = File.join(RAILS_ROOT, 'log', SpaminatorPlugin.name.underscore) 16 logdir = File.join(RAILS_ROOT, 'log', SpaminatorPlugin.name.underscore)
17 File.makedirs(logdir) if !File.exist?(logdir) 17 File.makedirs(logdir) if !File.exist?(logdir)
18 - logpath = File.join(logdir, "#{environment.name.to_slug}_#{ENV['RAILS_ENV']}_#{Time.now.strftime("%F_%T")}.log") 18 + logpath = File.join(logdir, "#{environment.name.to_slug}_#{ENV['RAILS_ENV']}_#{Time.now.strftime('%F_%T')}.log")
19 @logger = Logger.new(logpath) 19 @logger = Logger.new(logpath)
20 end 20 end
21 21
22 def log(message) 22 def log(message)
23 - @logger << "[#{Time.now.strftime("%F %T %z")}] #{message}\n" 23 + @logger << "[#{Time.now.strftime('%F %T %z')}] #{message}\n"
24 end 24 end
25 end 25 end
26 26