Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
pleroma
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
phaer
pleroma
Commits
474ef512
Commit
474ef512
authored
Feb 18, 2020
by
Alexander Strizhakov
Committed by
rinpatch
Mar 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wait in mix task while pleroma is rebooted
parent
f259b1ad
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
11 deletions
+48
-11
lib/mix/pleroma.ex
lib/mix/pleroma.ex
+13
-0
lib/pleroma/config/transfer_task.ex
lib/pleroma/config/transfer_task.ex
+5
-1
restarter/lib/pleroma.ex
restarter/lib/pleroma.ex
+30
-10
No files found.
lib/mix/pleroma.ex
View file @
474ef512
...
...
@@ -12,6 +12,19 @@ def start_pleroma do
end
{
:ok
,
_
}
=
Application
.
ensure_all_started
(
:pleroma
)
if
Pleroma
.
Config
.
get
(
:env
)
not
in
[
:test
,
:benchmark
]
do
pleroma_rebooted?
()
end
end
defp
pleroma_rebooted?
do
if
Restarter
.
Pleroma
.
rebooted?
()
do
:ok
else
Process
.
sleep
(
10
)
pleroma_rebooted?
()
end
end
def
load_pleroma
do
...
...
lib/pleroma/config/transfer_task.ex
View file @
474ef512
...
...
@@ -42,7 +42,8 @@ def start_link(_) do
@spec
load_and_update_env
([
ConfigDB
.
t
()])
::
:ok
|
false
def
load_and_update_env
(
deleted
\\
[],
restart_pleroma?
\\
true
)
do
with
true
<-
Pleroma
.
Config
.
get
(
:configurable_from_database
),
with
{
:configurable
,
true
}
<-
{
:configurable
,
Pleroma
.
Config
.
get
(
:configurable_from_database
)},
true
<-
Ecto
.
Adapters
.
SQL
.
table_exists?
(
Repo
,
"config"
),
started_applications
<-
Application
.
started_applications
()
do
# We need to restart applications for loaded settings take effect
...
...
@@ -65,12 +66,15 @@ def load_and_update_env(deleted \\ [], restart_pleroma? \\ true) do
if
:pleroma
in
applications
do
List
.
delete
(
applications
,
:pleroma
)
++
[
:pleroma
]
else
Restarter
.
Pleroma
.
rebooted
()
applications
end
Enum
.
each
(
applications
,
&
restart
(
started_applications
,
&1
,
Pleroma
.
Config
.
get
(
:env
)))
:ok
else
{
:configurable
,
false
}
->
Restarter
.
Pleroma
.
rebooted
()
end
end
...
...
restarter/lib/pleroma.ex
View file @
474ef512
...
...
@@ -3,11 +3,21 @@ defmodule Restarter.Pleroma do
require
Logger
@init_state
%{
need_reboot:
false
,
rebooted:
false
,
after_boot:
false
}
def
start_link
(
_
)
do
GenServer
.
start_link
(
__MODULE__
,
[],
name:
__MODULE__
)
end
def
init
(
_
),
do
:
{
:ok
,
%{
need_reboot?:
false
}}
def
init
(
_
),
do
:
{
:ok
,
@init_state
}
def
rebooted?
do
GenServer
.
call
(
__MODULE__
,
:rebooted?
)
end
def
rebooted
do
GenServer
.
cast
(
__MODULE__
,
:rebooted
)
end
def
need_reboot?
do
GenServer
.
call
(
__MODULE__
,
:need_reboot?
)
...
...
@@ -29,41 +39,51 @@ def restart_after_boot(env) do
GenServer
.
cast
(
__MODULE__
,
{
:after_boot
,
env
})
end
def
handle_call
(
:rebooted?
,
_from
,
state
)
do
{
:reply
,
state
[
:rebooted
],
state
}
end
def
handle_call
(
:need_reboot?
,
_from
,
state
)
do
{
:reply
,
state
[
:need_reboot
?
],
state
}
{
:reply
,
state
[
:need_reboot
],
state
}
end
def
handle_cast
(
:re
fresh
,
_
state
)
do
{
:noreply
,
%{
need_reboot?:
false
}
}
def
handle_cast
(
:re
booted
,
state
)
do
{
:noreply
,
Map
.
put
(
state
,
:rebooted
,
true
)
}
end
def
handle_cast
(
:need_reboot
,
%{
need_reboot
?
:
true
}
=
state
),
do
:
{
:noreply
,
state
}
def
handle_cast
(
:need_reboot
,
%{
need_reboot:
true
}
=
state
),
do
:
{
:noreply
,
state
}
def
handle_cast
(
:need_reboot
,
state
)
do
{
:noreply
,
Map
.
put
(
state
,
:need_reboot?
,
true
)}
{
:noreply
,
Map
.
put
(
state
,
:need_reboot
,
true
)}
end
def
handle_cast
(
:refresh
,
_state
)
do
{
:noreply
,
@init_state
}
end
def
handle_cast
({
:restart
,
:test
,
_
},
state
)
do
Logger
.
warn
(
"pleroma restarted"
)
{
:noreply
,
Map
.
put
(
state
,
:need_reboot
?
,
false
)}
{
:noreply
,
Map
.
put
(
state
,
:need_reboot
,
false
)}
end
def
handle_cast
({
:restart
,
_
,
delay
},
state
)
do
Process
.
sleep
(
delay
)
do_restart
(
:pleroma
)
{
:noreply
,
Map
.
put
(
state
,
:need_reboot
?
,
false
)}
{
:noreply
,
Map
.
put
(
state
,
:need_reboot
,
false
)}
end
def
handle_cast
({
:after_boot
,
_
},
%{
after_boot:
true
}
=
state
),
do
:
{
:noreply
,
state
}
def
handle_cast
({
:after_boot
,
:test
},
state
)
do
Logger
.
warn
(
"pleroma restarted"
)
{
:noreply
,
Map
.
put
(
state
,
:after_boot
,
true
)}
state
=
%{
state
|
after_boot:
true
,
rebooted:
true
}
{
:noreply
,
state
}
end
def
handle_cast
({
:after_boot
,
_
},
state
)
do
do_restart
(
:pleroma
)
{
:noreply
,
Map
.
put
(
state
,
:after_boot
,
true
)}
state
=
%{
state
|
after_boot:
true
,
rebooted:
true
}
{
:noreply
,
state
}
end
defp
do_restart
(
app
)
do
...
...
Write
Preview
Markdown
is supported
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