Commit 5cb92b6e authored by Mario's avatar Mario
Browse files

Merge branch 'dev' into 8.0RC

parents 2ddb88a3 8a7b2214
Pipeline #564834 passed with stage
in 53 seconds
......@@ -79,10 +79,7 @@ class Notifier {
static public $encoded_item = null;
static public $channel = null;
static public $private = false;
// $fragment can contain additional info to omit de-duplication in the queueworker.
// E.g. if an item is updated many times in a row from different sources (multiple vote updates) the
// update source mid or a timestamp or random string can be added.
static public $fragment = null;
static public function run($argc, $argv) {
......@@ -107,7 +104,6 @@ class Notifier {
self::$encoded_item = null;
self::$channel = null;
self::$private = false;
self::$fragment = null;
$sys = get_sys_channel();
$normal_mode = true;
......@@ -233,8 +229,6 @@ class Notifier {
// Fetch the target item
self::$fragment = $argv[3] ?? '';
$r = q("SELECT * FROM item WHERE id = %d AND parent != 0",
intval($item_id)
);
......@@ -701,7 +695,7 @@ class Notifier {
// This wastes a process if there are no delivery hooks configured, so check this before launching the new process
$x = q("select * from hook where hook = 'notifier_normal'");
if ($x) {
Master::Summon(['Deliver_hooks', $target_item['id'], self::$fragment]);
Master::Summon(['Deliver_hooks', $target_item['id']]);
}
}
......
......@@ -2183,7 +2183,14 @@ class Activity {
if ($u) {
dbq("COMMIT");
Master::Summon(['Notifier', 'wall-new', $item['id']/* , $post['mid'] trick queueworker de-duplication */ ]);
if ($multi) {
// wait some seconds for possible multiple answers to be processed
// before calling the notifier
sleep(3);
}
Master::Summon(['Notifier', 'wall-new', $item['id']]);
return true;
}
......
......@@ -862,7 +862,9 @@ class Libsync {
);
}
// update connection timestamp if this is the site we're talking to
// Update connection timestamp if this is the site we're talking to.
// Also mark all entries from the current site with different sitekeys
// deleted (the site has been re-installed)
// This only happens when called from import_xchan
$current_site = false;
......@@ -876,6 +878,12 @@ class Libsync {
intval($r[0]['hubloc_id']),
dbesc($t)
);
q("update hubloc set hubloc_error = 1, hubloc_deleted = 1 where hubloc_url = '%s' and hubloc_sitekey != '%s'",
dbesc($r[0]['hubloc_url']),
dbesc($r[0]['hubloc_sitekey'])
);
$current_site = true;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment