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 7b768ec..4c5cb47 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/plugins/ca.turbo.plg b/plugins/ca.turbo.plg new file mode 100644 index 0000000..21fa378 --- /dev/null +++ b/plugins/ca.turbo.plg @@ -0,0 +1,83 @@ + + + + + + + + + +]> + + + + +###2017.03.11 +- Initial Release + + + + + + + +]]> + + + + + +# Remove old 'source' files +rm -f $(ls /boot/config/plugins/&name;/&name;*.txz 2>/dev/null|grep -v '&version;') + + + + + +https://raw.github.com/&github;/master/archive/&name;-&version;-x86_64-1.txz +&md5; + + + + + +mkdir -p /tmp/ca.docker.autostart +echo "" +echo "----------------------------------------------------" +echo " &name; has been installed." +echo " Copyright 2017, Andrew Zawadzki" +echo " Version: &version;" +echo "----------------------------------------------------" +echo "" + + + + + + +removepkg &name;-&version;-x86_64-1 +rm -rf &plugdir; +rm -rf /boot/config/plugins/&name; + + + diff --git a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/README.md b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/README.md new file mode 100644 index 0000000..60c9efb --- /dev/null +++ b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/README.md @@ -0,0 +1,3 @@ +####CA Auto Turbo Write Mode### +Part of the CA family, CA Auto Turbo Write Mode will enable or disable unRaid's turbo write mode (reconstruct write) based upon the number of drives currently spun up. + 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 index 078d3dd..d02bdfb 100644 --- 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 @@ -1,5 +1,15 @@ -#!/bin/bash - -mkdir -p /tmp/ca.turbo -/usr/local/emhttp/plugins/ca.turbo/scripts/arrayStarted.php +#!/usr/bin/php + array("pipe", "r"), // stdin is a pipe that the child will read from + 1 => array("pipe", "w"), // stdout is a pipe that the child will write to + 2 => array("file", "/tmp/error-output.txt", "a") // stderr is a file to write to + ); + proc_open("/usr/local/emhttp/plugins/ca.turbo/scripts/auto_turbo.php",$descriptorspec,$pipes); +} +?> \ No newline at end of file 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 2143c0b..2e4de71 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 @@ -9,7 +9,7 @@ exec("mkdir -p /boot/config/plugins/ca.turbo"); file_put_contents("/boot/config/plugins/ca.turbo/settings.ini",create_ini_file($settings)); - if ( $settings['enable'] == 'no' ) { + if ( $settings['enabled'] == 'no' ) { if ( is_file($turboPaths['backgroundPID']) ) { logger("Stopping Auto Turbo"); $PID = file_get_contents($turboPaths['backgroundPID']); @@ -21,15 +21,26 @@ exec("/usr/local/sbin/mdcmd set md_write_method ".$unRaidVars['md_write_method']); } } - if ( $settings['enable'] == 'yes' ) { + if ( $settings['enabled'] == 'yes' ) { if ( is_file($turboPaths['backgroundPID']) ) { logger("Stopping Auto Turbo"); $PID = file_get_contents($turboPaths['backgroundPID']); posix_kill($PID,SIGKILL); - + @unlink($turboPaths['backgroundPID']); } logger("Starting Auto Turbo"); - exec("/usr/local/emhttp/plugins/ca.turbo/scripts/startBackground.sh"); + sleep(5); +# exec("/usr/local/emhttp/plugins/ca.turbo/scripts/startBackground.sh & > /dev/null | at NOW -M >/dev/null 2>&1"); +$descriptorspec = array( + 0 => array("pipe", "r"), // stdin is a pipe that the child will read from + 1 => array("pipe", "w"), // stdout is a pipe that the child will write to + 2 => array("file", "/tmp/error-output.txt", "a") // stderr is a file to write to +); +proc_open("/usr/local/emhttp/plugins/ca.turbo/scripts/auto_turbo.php",$descriptorspec,$pipes); + + + + } echo "Settings Updated"; break; diff --git a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/include/helpers.php b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/include/helpers.php index c95ff1f..f3740f9 100644 --- a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/include/helpers.php +++ b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/include/helpers.php @@ -49,8 +49,12 @@ function getPluginSettings() { } function logger($string) { + global $debug; + exec("logger ".escapeshellarg($string)); - echo "$string\n"; + if ($debug) { + echo "$string\n"; + } } ################################################################## diff --git a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/scripts/arrayStarted.php b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/scripts/arrayStarted.php deleted file mode 100644 index f02da8f..0000000 --- a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/scripts/arrayStarted.php +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/php - \ No newline at end of file diff --git a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/scripts/startBackground.sh b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/scripts/startBackground.sh deleted file mode 100644 index 268de4b..0000000 --- a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/scripts/startBackground.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -/usr/local/emhttp/plugins/ca.turbo/scripts/auto_turbo.php & > /dev/null | at NOW -M >/dev/null 2>&1 -