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

0.9.6.30: globales Lauf-Lock an run-all übergeben

Browse Source
This commit is contained in:
Terranom674
2026-08-19 20:17:24 +02:00
parent 21118f6fb3
commit 3ad6e9eb8e
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
runtime/native-runner.php
View File

@@ -11,7 +11,6 @@ $piwigoRoot = dirname($pluginRoot, 2);
$base = rtrim($piwigoRoot, '/').'/_data/bratonien-tools'; $base = rtrim($piwigoRoot, '/').'/_data/bratonien-tools';
$schedulerDir = $base.'/nc-connector-scheduler'; $schedulerDir = $base.'/nc-connector-scheduler';
$stateFile = $schedulerDir.'/state.json'; $stateFile = $schedulerDir.'/state.json';
$workerLock = $schedulerDir.'/worker.lock';
$runtimeDir = $base.'/nc-connector-runtime'; $runtimeDir = $base.'/nc-connector-runtime';
$stateRoot = $base.'/nc-connector-state'; $stateRoot = $base.'/nc-connector-state';
@@ -41,13 +40,6 @@ foreach (array($schedulerDir, $runtimeDir, $stateRoot) as $dir)
} }
} }
$lock = @fopen($workerLock, 'c+');
if (!is_resource($lock) || !@flock($lock, LOCK_EX | LOCK_NB))
{
if (is_resource($lock)) fclose($lock);
exit(0);
}
$state = native_scheduler_state($stateFile); $state = native_scheduler_state($stateFile);
$state['enabled'] = true; $state['enabled'] = true;
$state['mode'] = 'piwigo-native'; $state['mode'] = 'piwigo-native';
@@ -58,6 +50,7 @@ $state['timestamp'] = time();
native_scheduler_write($stateFile, $state); native_scheduler_write($stateFile, $state);
$env = $_ENV; $env = $_ENV;
$env['PATH'] = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin';
$env['BRATONIEN_NC_NATIVE'] = '1'; $env['BRATONIEN_NC_NATIVE'] = '1';
$env['BRATONIEN_NC_PIWIGO_ROOT'] = $piwigoRoot; $env['BRATONIEN_NC_PIWIGO_ROOT'] = $piwigoRoot;
$env['BRATONIEN_NC_CONFIG_DIR'] = $runtimeDir; $env['BRATONIEN_NC_CONFIG_DIR'] = $runtimeDir;
@@ -65,7 +58,8 @@ $env['BRATONIEN_NC_STATE_ROOT'] = $stateRoot;
$env['LC_ALL'] = 'C'; $env['LC_ALL'] = 'C';
$env['LANG'] = 'C'; $env['LANG'] = 'C';
$command = array('/usr/bin/env', 'bash', $pluginRoot.'/runtime/run-all.sh'); $bash = is_executable('/usr/bin/bash') ? '/usr/bin/bash' : '/bin/bash';
$command = array($bash, $pluginRoot.'/runtime/run-all.sh');
$spec = array( $spec = array(
0=>array('file','/dev/null','r'), 0=>array('file','/dev/null','r'),
1=>array('pipe','w'), 1=>array('pipe','w'),
@@ -103,7 +97,4 @@ if (empty($state['next_due']) || (int)$state['next_due'] < time())
$state['next_due'] = time() + 60; $state['next_due'] = time() + 60;
} }
native_scheduler_write($stateFile, $state); native_scheduler_write($stateFile, $state);
@flock($lock, LOCK_UN);
fclose($lock);
exit($exit === 0 ? 0 : 1); exit($exit === 0 ? 0 : 1);