From 869d8ab12db59a2582729bed68acc65d2cfab052 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 10 Apr 2018 11:10:02 +0000 Subject: [PATCH] We can now define the days after a contact is archived --- doc/htconfig.md | 3 ++- src/Model/Contact.php | 4 +++- src/Protocol/Diaspora.php | 2 +- src/Worker/Queue.php | 8 ++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/doc/htconfig.md b/doc/htconfig.md index 0b9d1cdd2b..977bf1dbcc 100644 --- a/doc/htconfig.md +++ b/doc/htconfig.md @@ -25,8 +25,9 @@ Example: To set the automatic database cleanup process add this line to your .ht * **allowed_link_protocols** (Array) - Allowed protocols in links URLs, add at your own risk. http is always allowed. * **always_show_preview** (Boolean) - Only show small preview picures. Default value is false. -* **block_local_dir** (Boolean) - Blocks the access to the directory of the local users. +* **archival_days** (Integer) - Number of days that we try to deliver content before we archive a contact. Defaults to 32. * **auth_cookie_lifetime** (Integer) - Number of days that should pass without any activity before a user who chose "Remember me" when logging in is considered logged out. Defaults to 7. +* **block_local_dir** (Boolean) - Blocks the access to the directory of the local users. * **config_adapter** (jit|preload) - Allow to switch the configuration adapter to improve performances at the cost of memory consumption. Default value is "jit" * **curl_range_bytes** - Maximum number of bytes that should be fetched. Default is 0, which mean "no limit". * **db_log** - Name of a logfile to log slow database queries diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 60dec8b289..1354bbdb89 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -306,7 +306,9 @@ class Contact extends BaseObject */ /// @todo Check for contact vitality via probing - $expiry = $contact['term-date'] . ' + 32 days '; + $archival_days = Config::get('system', 'archival_days', 32); + + $expiry = $contact['term-date'] . ' + ' . $archival_days . ' days '; if (DateTimeFormat::utcNow() > DateTimeFormat::utc($expiry)) { /* Relationship is really truly dead. archive them rather than * delete, though if the owner tries to unarchive them we'll start diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 79e7c09637..0e5f0c27f1 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -3319,7 +3319,7 @@ class Diaspora } } - logger("transmit: ".$logid."-".$guid." returns: ".$return_code); + logger("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code); if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) { if (!$no_queue && ($contact['contact-type'] != ACCOUNT_TYPE_RELAY)) { diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php index 5c8942db2a..57f6e92774 100644 --- a/src/Worker/Queue.php +++ b/src/Worker/Queue.php @@ -86,7 +86,7 @@ class Queue logger("Check server " . $server . " (" . $contact["network"] . ")"); $vital = PortableContact::checkServer($server, $contact["network"], true); - Cache::set($cachekey_server . $server, $vital, CACHE_QUARTER_HOUR); + Cache::set($cachekey_server . $server, $vital, CACHE_MINUTE); } if (!is_null($vital) && !$vital) { @@ -118,7 +118,7 @@ class Queue QueueModel::removeItem($q_item['id']); } else { QueueModel::updateTime($q_item['id']); - Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR); + Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE); } break; case NETWORK_OSTATUS: @@ -127,7 +127,7 @@ class Queue if ($deliver_status == -1) { QueueModel::updateTime($q_item['id']); - Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR); + Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE); } else { QueueModel::removeItem($q_item['id']); } @@ -141,7 +141,7 @@ class Queue QueueModel::removeItem($q_item['id']); } else { QueueModel::updateTime($q_item['id']); - Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR); + Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE); } break;