aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2022-12-11 10:40:02 +0000
committerMario <mario@mariovavti.com>2022-12-11 10:40:02 +0000
commit1c17768dc5a4de21d8b431807fd184101c1d2c58 (patch)
treeed58fbdfd70eb683f3065ad94442b3ef2f3213ac
parent86e1dd4673017ecc3f595ecfa6c9e257b86878ac (diff)
downloadvolse-hubzilla-1c17768dc5a4de21d8b431807fd184101c1d2c58.tar.gz
volse-hubzilla-1c17768dc5a4de21d8b431807fd184101c1d2c58.tar.bz2
volse-hubzilla-1c17768dc5a4de21d8b431807fd184101c1d2c58.zip
minor fixes
-rw-r--r--Zotlabs/Lib/QueueWorker.php11
-rw-r--r--include/text.php1
2 files changed, 4 insertions, 8 deletions
diff --git a/Zotlabs/Lib/QueueWorker.php b/Zotlabs/Lib/QueueWorker.php
index ff29fa065..9f60e3315 100644
--- a/Zotlabs/Lib/QueueWorker.php
+++ b/Zotlabs/Lib/QueueWorker.php
@@ -68,8 +68,6 @@ class QueueWorker {
public static function Summon(&$argv) {
- $argc = count($argv);
-
if ($argv[0] !== 'Queueworker') {
$priority = 0; // @TODO allow reprioritization
@@ -78,7 +76,7 @@ class QueueWorker {
$priority = self::$default_priorities[$argv[0]];
}
- $workinfo = ['argc' => $argc, 'argv' => $argv];
+ $workinfo = ['argc' => count($argv), 'argv' => $argv];
$workinfo_json = json_encode($workinfo);
$uuid = self::getUuid($workinfo_json);
@@ -118,8 +116,6 @@ class QueueWorker {
public static function Release(&$argv) {
- $argc = count($argv);
-
if ($argv[0] !== 'Queueworker') {
$priority = 0; // @TODO allow reprioritization
@@ -127,7 +123,7 @@ class QueueWorker {
$priority = self::$default_priorities[$argv[0]];
}
- $workinfo = ['argc' => $argc, 'argv' => $argv];
+ $workinfo = ['argc' => count($argv), 'argv' => $argv];
$workinfo_json = json_encode($workinfo);
$uuid = self::getUuid($workinfo_json);
@@ -250,7 +246,7 @@ class QueueWorker {
if ($load_average_sleep) {
$load_average = sys_getloadavg();
- self::$workersleep = intval($load_average[0]) * 100000;
+ self::$workersleep = intval($load_average[0]) * 10000;
if (!self::$workersleep) {
self::$workersleep = 100;
@@ -288,7 +284,6 @@ class QueueWorker {
$workinfo = json_decode($workitem[0]['workerq_data'], true);
$argv = $workinfo['argv'];
- logger('Master: process: ' . json_encode($argv), LOGGER_DEBUG);
$cls = '\\Zotlabs\\Daemon\\' . $argv[0];
$argv = flatten_array_recursive($argv);
diff --git a/include/text.php b/include/text.php
index cc480aacf..1608f5435 100644
--- a/include/text.php
+++ b/include/text.php
@@ -303,6 +303,7 @@ function purify_html($s, $allow_position = false) {
$def->addElement('footer', 'Block', 'Flow', 'Common');
//Inline
$def->addElement('button', 'Inline', 'Inline', 'Common');
+ $def->addElement('mark', 'Inline', 'Inline', 'Common');
if($allow_position) {