mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-25 20:01:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #841 from bergware/master

Browse Source 
Nchan start/stop foundation
This commit is contained in:
tom mortensen
2021-05-12 16:24:25 -07:00
committed by GitHub
parent d3b38db93e 502495627c
commit a02302fd34
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.docker.manager/DockerContainers.page
+1 -1
View File
@@ -3,7 +3,7 @@ Title="Docker Containers"
Tag="cubes"
Cond="is_file('/var/run/dockerd.pid')"
Markdown="false"
Nchan="docker_load"
Nchan="docker_load:stop"
---
<?PHP
/* Copyright 2005-2021, Lime Technology
plugins/dynamix/ArrayOperation.page
+3 -3
View File
@@ -276,15 +276,15 @@ devices.on('message', function(data) {
if ($('#'+table[0]).length) $('#'+table[0]).html(table[1]);
}
display_diskio();
<?if ($var['fsState']=='Stopped'):?>
setTimeout(function(){devices.stop();},0);
<?endif;?>
});
$(function(){
var form = document.arrayOps;
if (form.input !== undefined) selectInput(form);
devices.start();
<?if ($var['fsState']=='Stopped'):?>
setTimeout(function(){devices.stop();},100);
<?endif;?>
});
function formatWarning(val) {
if (val==true)
plugins/dynamix/include/DefaultPageLayout.php
+16 -14
View File
@@ -1080,23 +1080,25 @@ foreach ($pages as $page) {
}
if (count($pages)) {
$running = file_exists($nchan_no) ? explode(',',file_get_contents($nchan_no)) : [];
$start = array_diff($nchan, $running); // returns any new scripts to be started
$stop = array_diff($running, $nchan); // returns any old scripts to be stopped
// update list of current running nchan scripts
$running = array_merge($start,$running);
// start nchan scripts per page
foreach ($start as $script) exec("$nchan_go/$script &>/dev/null &");
/*
For the time being we don't stop the scripts, which allows multiple active browser sessions to work
The only exception is docker_load, which causes known high cpu load
*/
if (in_array('docker_load',$stop)) {
foreach ($stop as $script) if ($script=='docker_load') exec("pkill $script >/dev/null &");
array_splice($running,array_search('docker_load',$running),1);
$start = array_diff($nchan, $running); // returns any new scripts to be started
$stop = array_diff($running, $nchan); // returns any old scripts to be stopped
$running = array_merge($start, $running); // update list of current running nchan scripts
// start nchan scripts which are new
foreach ($start as $row) {
$script = explode(':',$row)[0];
exec("$nchan_go/$script &>/dev/null &");
}
// stop nchan scripts with the :stop option
foreach ($stop as $row) {
[$script,$opt] = explode(':',$row);
if ($opt == 'stop') {
exec("pkill $script >/dev/null &");
array_splice($running,array_search($row,$running),1);
}
}
if (count($running)) file_put_contents($nchan_no,implode(',',$running)); else @unlink($nchan_no);
}
unset($pages,$page,$pgs,$pg,$icon,$nchan,$running,$start,$stop);
unset($pages,$page,$pgs,$pg,$icon,$nchan,$running,$start,$stop,$row,$script,$opt);
?>
</div></div>
<div class="spinner fixed"></div>