diff --git a/archive/ca.turbo-2017.03.11-x86_64-1.txz b/archive/ca.turbo-2017.03.11-x86_64-1.txz index afef696..7b768ec 100644 Binary files a/archive/ca.turbo-2017.03.11-x86_64-1.txz and b/archive/ca.turbo-2017.03.11-x86_64-1.txz differ diff --git a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/Turbo.page b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/Turbo.page index 19e0760..262cb9d 100644 --- a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/Turbo.page +++ b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/Turbo.page @@ -8,7 +8,9 @@ $plugin = "ca.turbo"; function getPluginSettings() { $settings = @parse_ini_file("/usr/local/emhttp/plugins/ca.turbo/default.ini"); $userSettings = @parse_ini_file("/boot/config/plugins/ca.turbo/settings.ini"); - + if ( ! $userSettings ) { + $userSettings = array(); + } $userKeys = array_keys($userSettings); foreach ($userKeys as $key) { $settings[$key] = $userSettings[$key]; @@ -102,7 +104,7 @@ function applySettings() {
diff --git a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/default.ini b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/default.ini new file mode 100644 index 0000000..c084143 --- /dev/null +++ b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/default.ini @@ -0,0 +1,4 @@ +enabled="no" +maxSpunDown="0" +pollingTime="300" +debug="false" diff --git a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/event/disks_mounted b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/event/disks_mounted new file mode 100644 index 0000000..078d3dd --- /dev/null +++ b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/event/disks_mounted @@ -0,0 +1,5 @@ +#!/bin/bash + +mkdir -p /tmp/ca.turbo +/usr/local/emhttp/plugins/ca.turbo/scripts/arrayStarted.php + diff --git a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/event/stopping_svcs b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/event/stopping_svcs new file mode 100644 index 0000000..d79eafa --- /dev/null +++ b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/event/stopping_svcs @@ -0,0 +1,9 @@ +#!/bin/bash +if [[ -e /tmp/ca.turbo/PID ]] + then + logger "Stopping CA Turbo Mode" + PID=`cat /tmp/ca.turbo/PID` + logger "Terminating $PID" + kill $PID +fi + diff --git a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/include/exec.php b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/include/exec.php index 66463fd..2143c0b 100644 --- a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/include/exec.php +++ b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/include/exec.php @@ -16,6 +16,9 @@ posix_kill($PID,SIGKILL); @unlink($turboPaths['backgroundPID']); @unlink($turboPaths['status']); + logger("Setting write method to unRaid defined"); + $unRaidVars = parse_ini_file("/var/local/emhttp/var.ini"); + exec("/usr/local/sbin/mdcmd set md_write_method ".$unRaidVars['md_write_method']); } } if ( $settings['enable'] == 'yes' ) { @@ -23,6 +26,7 @@ logger("Stopping Auto Turbo"); $PID = file_get_contents($turboPaths['backgroundPID']); posix_kill($PID,SIGKILL); + } logger("Starting Auto Turbo"); exec("/usr/local/emhttp/plugins/ca.turbo/scripts/startBackground.sh"); @@ -31,9 +35,15 @@ break; case 'status': $status = readJsonFile($turboPaths['status']); - if ( ! $status ) { return; } + if ( ! $status ) { + $unRaidVars = parse_ini_file("/var/local/emhttp/var.ini"); + if ($unRaidVars['md_write_method'] == "1") { + $status['mode'] = "turbo"; + } + } + $spunDown = ( $status ) ? $status['spundown'] : "Script Not Running"; $o = "