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
406
Issues
406
List
Boards
Labels
Service Desk
Milestones
Merge Requests
59
Merge Requests
59
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Pleroma
pleroma
Commits
cc837f9d
Commit
cc837f9d
authored
Jun 24, 2020
by
Maksim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed config/descpiption.exs
parent
71e23326
Pipeline
#27647
passed with stages
in 9 minutes and 38 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
21 deletions
+2
-21
config/description.exs
config/description.exs
+1
-8
lib/pleroma/application.ex
lib/pleroma/application.ex
+1
-13
No files found.
config/description.exs
View file @
cc837f9d
...
...
@@ -1996,18 +1996,11 @@
"""
,
children:
[
%{
key:
:
verbose
,
key:
:
log
,
type:
{
:dropdown
,
:atom
},
description:
"Logs verbose mode"
,
suggestions:
[
false
,
:error
,
:warn
,
:info
,
:debug
]
},
%{
key:
:prune
,
type:
[
:atom
,
:tuple
],
description:
"Non-retryable jobs [pruning settings](https://github.com/sorentwo/oban#pruning)"
,
suggestions:
[
:disabled
,
{
:maxlen
,
1500
},
{
:maxage
,
60
*
60
}]
},
%{
key:
:queues
,
type:
{
:keyword
,
:integer
},
...
...
lib/pleroma/application.ex
View file @
cc837f9d
...
...
@@ -80,7 +80,7 @@ def start(_type, _args) do
[
Pleroma
.
Stats
,
Pleroma
.
JobQueueMonitor
,
{
Oban
,
oban_config
(
)}
{
Oban
,
Config
.
get
(
Oban
)}
]
++
task_children
(
@env
)
++
streamer_child
(
@env
)
++
...
...
@@ -138,18 +138,6 @@ defp setup_instrumenters do
Pleroma
.
Web
.
Endpoint
.
Instrumenter
.
setup
()
end
defp
oban_config
do
config
=
Config
.
get
(
Oban
)
if
Code
.
ensure_loaded?
(
IEx
)
and
IEx
.
started?
()
do
config
|>
Keyword
.
put
(
:crontab
,
false
)
|>
Keyword
.
put
(
:queues
,
false
)
else
config
end
end
defp
cachex_children
do
[
build_cachex
(
"used_captcha"
,
ttl_interval:
seconds_valid_interval
()),
...
...
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