Merge pull request #12004 from annando/priorities

[friendica.git] / static / defaults.config.php

diff --git a/static/defaults.config.php b/static/defaults.config.php
index adffad89674e36f4672cfc59d234e8597da6cfeb..647fb73b13ffc325cf689a7171e45a7230daee59 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -284,7 +284,7 @@ return [
 
                // expire-notify-priority (integer)
                // Priority for the expirary notification 
-               'expire-notify-priority' => PRIORITY_LOW,
+               'expire-notify-priority' => Friendica\Core\Worker::PRIORITY_LOW,
 
                // fetch_by_worker (Boolean)
                // Fetch missing posts via a background process
@@ -525,6 +525,14 @@ return [
                // The authentication password for the redis database
                'redis_password' => null,
 
+               // relay_deny_languages (Array)
+               // Array of languages (two digit format) that are rejected.
+               'relay_deny_languages' => [],
+
+               // relay_deny_undetected_language (Boolean)
+               // Deny undetected languages
+               'relay_deny_undetected_language' => false,
+
                // session_handler (database|cache|native)
                // Whether to use Cache to store session data or to use PHP native session storage.
                'session_handler' => 'database',
@@ -544,7 +552,7 @@ return [
                // runtime_loglimit (Integer)
                // The runtime is logged, When the program execution time is higher than this value.
                'runtime_loglimit' => 0,
-       
+
                // sendmail_params (Boolean)
                // Normal sendmail command parameters will be added when the PHP mail() function is called for sending e-mails.
                // This ensures the Sender Email address setting is applied to the message envelope rather than the host's default address.
@@ -607,7 +615,7 @@ return [
                // Minimum for this config value is 1. Maximum is 64 as the resulting profile URL mustn't be longer than 255 chars.
                'username_max_length' => 48,
 
-               // worker_cooldown (Integer)
+               // worker_cooldown (Float)
                // Cooldown period in seconds before each worker function call.
                'worker_cooldown' => 0,
 
@@ -642,6 +650,16 @@ return [
                // Setting 0 would allow maximum worker queues at all times, which is not recommended.
                'worker_load_exponent' => 3,
 
+               // worker_max_duration (Array)
+               // Maximum runtime per priority. Worker processes that exceed this runtime will be terminated.
+               'worker_max_duration' => [
+                       Friendica\Core\Worker::PRIORITY_CRITICAL   => 720,
+                       Friendica\Core\Worker::PRIORITY_HIGH       => 10,
+                       Friendica\Core\Worker::PRIORITY_MEDIUM     => 60,
+                       Friendica\Core\Worker::PRIORITY_LOW        => 180,
+                       Friendica\Core\Worker::PRIORITY_NEGLIGIBLE => 720
+               ],
+
                // worker_processes_cooldown (Integer)
                // Maximum number per processes that causes a cooldown before each worker function call.
                'worker_processes_cooldown' => 0,
@@ -651,7 +669,7 @@ return [
                // This is an experimental setting without knowing the performance impact.
                // Does not work when "worker_fork" is enabled (Needs more testing)
                'worker_multiple_fetch' => false,
-               
+
                // worker_defer_limit (Integer)
                // Per default the systems tries delivering for 15 times before dropping it.
                'worker_defer_limit' => 15,