haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wsd: add rlimit config entries and defaults 

Change-Id: I8cb498d01bc1a7a55d168e49c754bb1bba80aea1
Reviewed-on: https://gerrit.libreoffice.org/38673
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
feature/lok_dialog
Ashod Nakashian 2017-06-11 11:39:15 -04:00 committed by Ashod Nakashian
parent 92d29b1ce7
commit 9cb82cebe3
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
loolwsd.xml.in
View File

@ -15,6 +15,10 @@
<per_document desc="Document-specific settings, including LO Core settings.">
<max_concurrency desc="The maximum number of threads to use while processing a document." type="uint" default="4">4</max_concurrency>
<idle_timeout_secs desc="The maximum number of seconds before unloading an idle document. Defaults to 1 hour." type="uint" default="3600">3600</idle_timeout_secs>
<limit_virt_mem_kb desc="The maximum virtual memory allowed to each document process. 0 for unlimited, 1700 min." type="uint">0</limit_virt_mem_kb>
<limit_data_mem_kb desc="The maximum memory data segment allowed to each document process. 0 for unlimited." type="uint">0</limit_data_mem_kb>
<limit_stack_mem_kb desc="The maximum stack size allowed to each document process. 0 for unlimited." type="uint">8000</limit_stack_mem_kb>
<limit_file_size_mb desc="The maximum file size allowed to each documen process to write. 0 for unlimited." type="uint">50</limit_file_size_mb>
</per_document>
<per_view desc="View-specific settings.">

4
wsd/LOOLWSD.cpp
View File

@ -624,6 +624,10 @@ void LOOLWSD::initialize(Application& self)
{ "num_prespawn_children", "1" },
{ "per_document.max_concurrency", "4" },
{ "per_document.idle_timeout_secs", "3600" },
{ "per_document.limit_virt_mem_mb", "0" },
{ "per_document.limit_data_mem_kb", "0" },
{ "per_document.limit_stack_mem_kb", "8000" },
{ "per_document.limit_file_size_mb", "50" },
{ "per_view.out_of_focus_timeout_secs", "60" },
{ "per_view.idle_timeout_secs", "900" },
{ "loleaflet_html", "loleaflet.html" },