Download as
Browse Code »

Commit db02d002d35b37094d6ebfed0df3565158591d48

Authored by Rodrigo Souto
2 parents d6f86b4d 9863d3e9
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

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 5 def self.log(spammer_ip, object=nil)
6 6 if object
7 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 9 end
10 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 12 end
13 13 end
14 14  
... ...
plugins/spaminator/lib/spaminator_plugin/spaminator.rb
  Diff comments   View file @db02d00
... ... @@ -15,12 +15,12 @@ class SpaminatorPlugin::Spaminator
15 15 def initialize_logger(environment)
16 16 logdir = File.join(RAILS_ROOT, 'log', SpaminatorPlugin.name.underscore)
17 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 19 @logger = Logger.new(logpath)
20 20 end
21 21  
22 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 24 end
25 25 end
26 26  
... ...