Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
4e7418d9
Commit
4e7418d9
authored
Nov 04, 2020
by
lain
Browse files
Merge branch 'stats-genserver-fix' into 'develop'
don't run Stats GenServer updates in tests See merge request
!2976
parents
d8d4e962
7bbc328d
Pipeline
#32575
passed with stages
in 96 minutes and 1 second
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/stats.ex
View file @
4e7418d9
...
@@ -23,7 +23,6 @@ def start_link(_) do
...
@@ -23,7 +23,6 @@ def start_link(_) do
@impl
true
@impl
true
def
init
(
_args
)
do
def
init
(
_args
)
do
if
Pleroma
.
Config
.
get
(
:env
)
==
:test
,
do
:
:ok
=
Ecto
.
Adapters
.
SQL
.
Sandbox
.
checkout
(
Repo
)
{
:ok
,
nil
,
{
:continue
,
:calculate_stats
}}
{
:ok
,
nil
,
{
:continue
,
:calculate_stats
}}
end
end
...
@@ -32,11 +31,6 @@ def force_update do
...
@@ -32,11 +31,6 @@ def force_update do
GenServer
.
call
(
__MODULE__
,
:force_update
)
GenServer
.
call
(
__MODULE__
,
:force_update
)
end
end
@doc
"Performs collect stats"
def
do_collect
do
GenServer
.
cast
(
__MODULE__
,
:run_update
)
end
@doc
"Returns stats data"
@doc
"Returns stats data"
@spec
get_stats
()
::
%{
@spec
get_stats
()
::
%{
domain_count:
non_neg_integer
(),
domain_count:
non_neg_integer
(),
...
@@ -111,7 +105,11 @@ def get_status_visibility_count(instance \\ nil) do
...
@@ -111,7 +105,11 @@ def get_status_visibility_count(instance \\ nil) do
@impl
true
@impl
true
def
handle_continue
(
:calculate_stats
,
_
)
do
def
handle_continue
(
:calculate_stats
,
_
)
do
stats
=
calculate_stat_data
()
stats
=
calculate_stat_data
()
Process
.
send_after
(
self
(),
:run_update
,
@interval
)
unless
Pleroma
.
Config
.
get
(
:env
)
==
:test
do
Process
.
send_after
(
self
(),
:run_update
,
@interval
)
end
{
:noreply
,
stats
}
{
:noreply
,
stats
}
end
end
...
@@ -126,13 +124,6 @@ def handle_call(:get_state, _from, state) do
...
@@ -126,13 +124,6 @@ def handle_call(:get_state, _from, state) do
{
:reply
,
state
,
state
}
{
:reply
,
state
,
state
}
end
end
@impl
true
def
handle_cast
(
:run_update
,
_state
)
do
new_stats
=
calculate_stat_data
()
{
:noreply
,
new_stats
}
end
@impl
true
@impl
true
def
handle_info
(
:run_update
,
_
)
do
def
handle_info
(
:run_update
,
_
)
do
new_stats
=
calculate_stat_data
()
new_stats
=
calculate_stat_data
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment