This website works better with JavaScript.
Home
Explore
Help
Sign In
closed-social
/
mastodon
Watch
3
Star
0
Fork
2
Code
Issues
5
Pull Requests
0
Projects
0
Releases
3
Wiki
Activity
Browse Source
Fix statsd null backend not being initialized properly
closed-social-glitch-2
Eugen Rochko
7 years ago
parent
8b9206f7d9
commit
f051c2e813
4 changed files
with
7 additions
and
7 deletions
Split View
Diff Options
Show Stats
Download Patch File
Download Diff File
+1
-1
Gemfile
+3
-4
Gemfile.lock
+2
-1
app/models/account.rb
+1
-1
config/environments/production.rb
+ 1
- 1
Gemfile
View File
@ -19,7 +19,7 @@ gem 'dotenv-rails'
gem
'font-awesome-rails'
gem
'best_in_place'
,
'~> 3.0.1'
gem
'paperclip'
,
'~> 5.
0
'
gem
'paperclip'
,
'~> 5.
1
'
gem
'paperclip-av-transcoder'
gem
'aws-sdk'
,
'>= 2.0'
+ 3
- 4
Gemfile.lock
View File
@ -76,8 +76,7 @@ GEM
bullet (5.3.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.10.0)
climate_control (0.0.3)
activesupport (>= 3.0)
climate_control (0.1.0)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.1)
@ -89,7 +88,7 @@ GEM
execjs
coffee-script-source (1.10.0)
colorize (0.8.1)
concurrent-ruby (1.0.
3
)
concurrent-ruby (1.0.
4
)
connection_pool (2.2.1)
crack (0.4.3)
safe_yaml (~> 1.0.0)
@ -437,7 +436,7 @@ DEPENDENCIES
nokogiri
oj
ostatus2
paperclip (~> 5.
0
)
paperclip (~> 5.
1
)
paperclip-av-transcoder
pg
pg_search
+ 2
- 1
app/models/account.rb
View File
@ -126,7 +126,8 @@ class Account < ApplicationRecord
def
save_with_optional_avatar!
save!
rescue
ActiveRecord
::
RecordInvalid
self
.
avatar
=
nil
self
.
avatar
=
nil
self
[
:avatar_remote_url
]
=
''
save!
end
+ 1
- 1
config/environments/production.rb
View File
@ -106,6 +106,6 @@ Rails.application.configure do
config
.
active_record
.
logger
=
nil
config
.
to_prepare
do
StatsD
.
backend
=
StatsD
::
Instrument
::
Backends
::
NullBackend
if
ENV
[
'STATSD_ADDR'
]
.
blank?
StatsD
.
backend
=
StatsD
::
Instrument
::
Backends
::
NullBackend
.
new
if
ENV
[
'STATSD_ADDR'
]
.
blank?
end
end
Write
Preview
Loading…
Cancel
Save