Thomas/Piwigo_Bratonien_Tools
1
0
Fork 0
mirror of https://github.com/Terranom674/Piwigo_Bratonien_Tools.git synced 2026-09-20 00:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only defer cache for an actually active connector service

Browse Source
This commit is contained in:
Terranom674
2026-09-06 22:47:14 +02:00
parent 51e864060b
commit de193ca491
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
runtime/webdav-warmup-dispatch.php
View File

@@ -23,7 +23,7 @@ $_SERVER['REQUEST_URI'] = '/';
$_SERVER['SCRIPT_NAME'] = '/plugins/bratonien_tools/runtime/webdav-warmup-dispatch.php'; $_SERVER['SCRIPT_NAME'] = '/plugins/bratonien_tools/runtime/webdav-warmup-dispatch.php';
$_SERVER['PHP_SELF'] = $_SERVER['SCRIPT_NAME']; $_SERVER['PHP_SELF'] = $_SERVER['SCRIPT_NAME'];
$_SERVER['QUERY_STRING'] = ''; $_SERVER['QUERY_STRING'] = '';
$_SERVER['HTTP_USER_AGENT'] = 'Bratonien-WebDAV-Worker-Dispatcher/0.9.7.1.49'; $_SERVER['HTTP_USER_AGENT'] = 'Bratonien-WebDAV-Worker-Dispatcher/0.9.7.1.50';
$_SERVER['HTTPS'] = 'off'; $_SERVER['HTTPS'] = 'off';
require_once(PHPWG_ROOT_PATH.'include/common.inc.php'); require_once(PHPWG_ROOT_PATH.'include/common.inc.php');
@@ -89,8 +89,22 @@ function bratonien_tools_webdav_dispatch_only_connector_deferrals(array $output)
return $seen; return $seen;
} }
function bratonien_tools_webdav_dispatch_connector_service_active()
{
if (!function_exists('exec') || !is_executable('/usr/bin/systemctl')) return false;
$output = array();
$exit = 1;
@exec('/usr/bin/systemctl is-active --quiet bratonien-nc-connector.service 2>/dev/null', $output, $exit);
return $exit === 0;
}
function bratonien_tools_webdav_dispatch_connector_busy($state_dir) function bratonien_tools_webdav_dispatch_connector_busy($state_dir)
{ {
// Ein belegtes Lock allein ist kein Beweis für einen laufenden Connector.
// Maßgeblich ist der privilegierte systemd-Dienst. Damit können Alt-/Fremd-
// Locks den Cache-Aufbau nicht dauerhaft als vermeintlichen Sync blockieren.
if (!bratonien_tools_webdav_dispatch_connector_service_active()) return false;
$lock = @fopen(rtrim((string)$state_dir, '/').'/webdav-sync.lock', 'c'); $lock = @fopen(rtrim((string)$state_dir, '/').'/webdav-sync.lock', 'c');
if (!$lock) return false; if (!$lock) return false;
if (@flock($lock, LOCK_SH | LOCK_NB)) if (@flock($lock, LOCK_SH | LOCK_NB))