From 98e13b0e445e4c45e6261fbbf40b2bcc189622b1 Mon Sep 17 00:00:00 2001 From: Darko Date: Thu, 13 Jun 2013 14:51:48 +0200 Subject: [PATCH] Added fix android, fix core, fix prodji and remove blacklist releases Some scripts addedd some removed, some re-added and tmux reorganized --- bin/monitor.php | 107 +++++++++++++++++++++++++++++++----- bin/scripts/check_vars.sh | 2 +- config.sh | 12 ++++ nnscripts/lib/Getopt.php | 1 - nnscripts/lib/nnscripts.php | 14 +++-- nnscripts/settings.ini | 11 +++- start.sh | 5 ++ 7 files changed, 130 insertions(+), 22 deletions(-) diff --git a/bin/monitor.php b/bin/monitor.php index 53c0a3f90..75da44114 100644 --- a/bin/monitor.php +++ b/bin/monitor.php @@ -776,57 +776,57 @@ while( $i > 0 ) } } - //run optimize in pane 1.4 + //run optimize in pane 1.5 if ( $array['INNODB'] == "true" ) { if (( $array['MAX_LOAD'] >= get_load()) && ( TIME() - $time6 >= $array['MYISAM_LARGE'] ) && ( $array['OPTIMIZE'] == "true" ) && ( $optimize_run == "true" )) { $color = get_color(); - $log = writelog($panes1[4]); - shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.4 'echo \"\033[38;5;\"$color\"m\" && $ds1 MYISAM_LARGE $ds2 && cd $_user && ./${array['USER_DEF_TWO']} 2>&1 $log && cd $_bin && $_php optimize_myisam.php true 2>&1 $log && cd $_user && ./${array['USER_DEF_THREE']} 2>&1 $log && echo \" \033[1;0;33m\" && $ds1 MYISAM_LARGE $ds3' 2>&1 1> /dev/null"); + $log = writelog($panes1[5]); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.5 'echo \"\033[38;5;\"$color\"m\" && $ds1 MYISAM_LARGE $ds2 && cd $_user && ./${array['USER_DEF_TWO']} 2>&1 $log && cd $_bin && $_php optimize_myisam.php true 2>&1 $log && cd $_user && ./${array['USER_DEF_THREE']} 2>&1 $log && echo \" \033[1;0;33m\" && $ds1 MYISAM_LARGE $ds3' 2>&1 1> /dev/null"); echo "\033[1;41;33mOPTIMIZATION OF THE MYSQL TABLES HAS STARTED, DO NOT STOP THIS SCRIPT!\033[1;0;33m\n\n"; $time6 = TIME(); } elseif (( $array['MAX_LOAD'] >= get_load()) && ( TIME() - $time8 >= $array['INNODB_LARGE'] ) && ( $array['OPTIMIZE'] == "true" ) && ( $optimize_run == "true" )) { $color = get_color(); $log = writelog($panes1[4]); - shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.4 'echo \"\033[38;5;\"$color\"m\" && $ds1 INNODB_LARGE $ds2 && cd $_user && ./${array['USER_DEF_FOUR']} 2>&1 $log && cd $_bin && $_php optimize_myisam.php true 2>&1 $log && $_php optimize_innodb.php true 2>&1 $log && cd $_user && ./${array['USER_DEF_FIVE']} 2>&1 $log && echo \" \033[1;0;33m\" && $ds1 INNODB_LARGE $ds3' 2>&1 1> /dev/null"); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.5 'echo \"\033[38;5;\"$color\"m\" && $ds1 INNODB_LARGE $ds2 && cd $_user && ./${array['USER_DEF_FOUR']} 2>&1 $log && cd $_bin && $_php optimize_myisam.php true 2>&1 $log && $_php optimize_innodb.php true 2>&1 $log && cd $_user && ./${array['USER_DEF_FIVE']} 2>&1 $log && echo \" \033[1;0;33m\" && $ds1 INNODB_LARGE $ds3' 2>&1 1> /dev/null"); echo "\033[1;41;33mOPTIMIZATION OF THE MYSQL TABLES HAS STARTED, DO NOT STOP THIS SCRIPT!\033[1;0;33m\n\n"; $time8 = TIME(); } elseif (( $array['MAX_LOAD'] >= get_load()) && ( TIME() - $time5 >= $array['INNODB_SMALL'] ) && ( $array['INNODB']== "true" ) && ( $array['OPTIMIZE'] == "true" ) && ( $optimize_run == "true" )) { $color = get_color(); $log = writelog($panes1[4]); - shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.4 'echo \"\033[38;5;\"$color\"m\" && $ds1 INNODB_SMALL $ds2 && cd $_bin && $_php optimize_innodb.php 2>&1 $log && echo \" \033[1;0;33m\" && $ds1 INNODB_SMALL $ds3' 2>&1 1> /dev/null"); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.5 'echo \"\033[38;5;\"$color\"m\" && $ds1 INNODB_SMALL $ds2 && cd $_bin && $_php optimize_innodb.php 2>&1 $log && echo \" \033[1;0;33m\" && $ds1 INNODB_SMALL $ds3' 2>&1 1> /dev/null"); echo "\033[1;41;33mOPTIMIZATION OF THE MYSQL TABLES HAS STARTED, DO NOT STOP THIS SCRIPT!\033[1;0;33m\n\n"; $time5 = TIME(); } elseif (( $array['MAX_LOAD'] >= get_load()) && ( TIME() - $time11 >= $array['MYISAM_SMALL'] ) && ( $array['OPTIMIZE'] == "true" ) && ( $optimize_run == "true" )) { $color = get_color(); $log = writelog($panes1[4]); - shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.4 'echo \"\033[38;5;\"$color\"m\" && $ds1 MYISAM_SMALL $ds2 && cd $_bin && $_php optimize_myisam.php 2>&1 $log && echo \" \033[1;0;33m\" && $ds1 MYISAM_SMALL $ds3' 2>&1 1> /dev/null"); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.5 'echo \"\033[38;5;\"$color\"m\" && $ds1 MYISAM_SMALL $ds2 && cd $_bin && $_php optimize_myisam.php 2>&1 $log && echo \" \033[1;0;33m\" && $ds1 MYISAM_SMALL $ds3' 2>&1 1> /dev/null"); echo "\033[1;41;33mOPTIMIZATION OF THE MYSQL TABLES HAS STARTED, DO NOT STOP THIS SCRIPT!\033[1;0;33m\n\n"; $time11 = TIME(); } elseif (( $array['OPTIMIZE'] == "true" ) && ( $array['MAX_LOAD'] <= get_load())) { $color = get_color(); - shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.4 'echo \"\033[38;5;\"$color\"m\nOptimize Disabled by MAX_LOAD\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.5 'echo \"\033[38;5;\"$color\"m\nOptimize Disabled by MAX_LOAD\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); } elseif ( $array['OPTIMIZE'] != "true" ) { $color = get_color(); - shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.4 'echo \"\033[38;5;\"$color\"m\nOptimize Disabled by OPTIMIZE\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.5 'echo \"\033[38;5;\"$color\"m\nOptimize Disabled by OPTIMIZE\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); } else { $color = get_color(); $run_time1 = relativeTime( $array['MYISAM_LARGE'] + $time6 ); $run_time2 = relativeTime( $array['INNODB_LARGE'] + $time8 ); $run_time3 = relativeTime( $array['INNODB_SMALL'] + $time5 ); $run_time4 = relativeTime( $array['MYISAM_SMALL'] + $time11 ); - shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.4 'echo \"\033[38;5;\"$color\"m\nMYISAM_LARGE will run in T[ $run_time1]\nINNODB_LARGE will run in T[ $run_time2]\nINNODB_SMALL will run in T[ $run_time3]\nMYISAM_SMALL will run in T[ $run_time4]\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.5 'echo \"\033[38;5;\"$color\"m\nMYISAM_LARGE will run in T[ $run_time1]\nINNODB_LARGE will run in T[ $run_time2]\nINNODB_SMALL will run in T[ $run_time3]\nMYISAM_SMALL will run in T[ $run_time4]\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); } } else { if (( $array['MAX_LOAD'] >= get_load()) && ( TIME() - $time6 >= $array['MYISAM_LARGE'] ) && ( $array['OPTIMIZE'] == "true" ) && ( $optimize_run == "true" )) { $color = get_color(); $log = writelog($panes1[4]); - shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.4 'echo \"\033[38;5;\"$color\"m\" && $ds1 MYISAM_LARGE $ds2 && cd $_user && ./${array['USER_DEF_TWO']} 2>&1 $log && cd $_bin && $_php optimize_myisam.php true 2>&1 $log && cd $_user && ./${array['USER_DEF_THREE']} 2>&1 $log && echo \" \033[1;0;33m\" && $ds1 MYISAM_LARGE $ds3' 2>&1 1> /dev/null"); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.5 'echo \"\033[38;5;\"$color\"m\" && $ds1 MYISAM_LARGE $ds2 && cd $_user && ./${array['USER_DEF_TWO']} 2>&1 $log && cd $_bin && $_php optimize_myisam.php true 2>&1 $log && cd $_user && ./${array['USER_DEF_THREE']} 2>&1 $log && echo \" \033[1;0;33m\" && $ds1 MYISAM_LARGE $ds3' 2>&1 1> /dev/null"); echo "\033[1;41;33mOPTIMIZATION OF THE MYSQL TABLES HAS STARTED, DO NOT STOP THIS SCRIPT!\033[1;0;33m\n\n"; $time6 = TIME(); } elseif (( $array['MAX_LOAD'] >= get_load()) && ( TIME() - $time11 >= $array['MYISAM_SMALL'] ) && ( $array['OPTIMIZE'] == "true" ) && ( $optimize_run == "true" )) { $color = get_color(); $log = writelog($panes1[4]); - shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.4 'echo \"\033[38;5;\"$color\"m\" && $ds1 MYISAM_SMALL $ds2 && cd $_bin && $_php optimize_myisam.php 2>&1 $log && echo \" \033[1;0;33m\" && $ds1 MYISAM_SMALL $ds3' 2>&1 1> /dev/null"); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.5 'echo \"\033[38;5;\"$color\"m\" && $ds1 MYISAM_SMALL $ds2 && cd $_bin && $_php optimize_myisam.php 2>&1 $log && echo \" \033[1;0;33m\" && $ds1 MYISAM_SMALL $ds3' 2>&1 1> /dev/null"); echo "\033[1;41;33mOPTIMIZATION OF THE MYSQL TABLES HAS STARTED, DO NOT STOP THIS SCRIPT!\033[1;0;33m\n\n"; $time11 = TIME(); } elseif (( $array['OPTIMIZE'] == "true" ) && ( $array['MAX_LOAD'] <= get_load())) { @@ -834,12 +834,12 @@ while( $i > 0 ) shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.4 'echo \"\033[38;5;\"$color\"m\nOptimize Disabled by MAX_LOAD\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); } elseif ( $array['OPTIMIZE'] != "true" ) { $color = get_color(); - shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.4 'echo \"\033[38;5;\"$color\"m\nOptimize Disabled by OPTIMIZE\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.5 'echo \"\033[38;5;\"$color\"m\nOptimize Disabled by OPTIMIZE\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); } else { $color = get_color(); $run_time1 = relativeTime( $array['MYISAM_LARGE'] + $time6 ); $run_time4 = relativeTime( $array['MYISAM_SMALL'] + $time11 ); - shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.4 'echo \"\033[38;5;\"$color\"m\nMYISAM_LARGE will run in T[ $run_time1]\nMYISAM_SMALL will run in T[ $run_time4]\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.5 'echo \"\033[38;5;\"$color\"m\nMYISAM_LARGE will run in T[ $run_time1]\nMYISAM_SMALL will run in T[ $run_time4]\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); } } @@ -1217,7 +1217,86 @@ while( $i > 0 ) $color = get_color(); shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.4 'echo \"\033[38;5;\"$color\"m\n$panes1[4] Disabled by OPTIMIZE\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); } - +//run $_php fix_android_releases.php in 1.6 + if (( $array['MAX_LOAD'] >= get_load()) && ((( TIME() - $time17 ) >= $array['FIX_TIMER'] ) || ( $i == 15 )) && ( $array['FIX_DROID'] == "true" ) && ( $optimize_safe_to_run != "true" )) { + $color = get_color(); + $log = writelog($panes1[6]); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.6 'echo \"\033[38;5;\"$color\"m\" && $ds1 $panes1[6] $ds2 && cd $_cj && $_php fix_android_releases.php 2>&1 $log && $ds1 $panes1[6] $ds3' 2>&1 1> /dev/null"); + $time17 = TIME(); + } elseif (( $array['FIX_DROID'] != "true" ) && ( $optimize_safe_to_run != "true" )) { + $color = get_color(); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.6 'echo \"\033[38;5;\"$color\"m\n$panes1[6] Disabled by FIX_TIMER\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } elseif (( $optimize_safe_to_run != "true" ) && ( $array['MAX_LOAD'] >= get_load())) { + $color = get_color(); + $run_time = relativeTime( $array['FIX_TIMER'] + $time17 ); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.6 'echo \"\033[38;5;\"$color\"m\n$panes1[6] will run in T[ $run_time]\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } elseif (( $optimize_safe_to_run != "true" ) && ( $array['MAX_LOAD'] <= get_load())) { + $color = get_color(); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.6 'echo \"\033[38;5;\"$color\"m\n$panes1[6] Disabled by MAX_LOAD\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } elseif ( $optimize_safe_to_run == "true" ) { + $color = get_color(); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.6 'echo \"\033[38;5;\"$color\"m\n$panes1[6] Disabled by OPTIMIZE\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } + //run $_php fix_core_releases.php in 1.7 + if (( $array['MAX_LOAD'] >= get_load()) && ((( TIME() - $time17 ) >= $array['FIX_TIMER'] ) || ( $i == 15 )) && ( $array['FIX_CORE'] == "true" ) && ( $optimize_safe_to_run != "true" )) { + $color = get_color(); + $log = writelog($panes1[7]); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.7 'echo \"\033[38;5;\"$color\"m\" && $ds1 $panes1[7] $ds2 && cd $_cj && $_php fix_core_releases.php 2>&1 $log && $ds1 $panes1[7] $ds3' 2>&1 1> /dev/null"); + $time17 = TIME(); + } elseif (( $array['FIX_CORE'] != "true" ) && ( $optimize_safe_to_run != "true" )) { + $color = get_color(); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.7 'echo \"\033[38;5;\"$color\"m\n$panes1[7] Disabled by FIX_TIMER\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } elseif (( $optimize_safe_to_run != "true" ) && ( $array['MAX_LOAD'] >= get_load())) { + $color = get_color(); + $run_time = relativeTime( $array['FIX_TIMER'] + $time17 ); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.7 'echo \"\033[38;5;\"$color\"m\n$panes1[7] will run in T[ $run_time]\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } elseif (( $optimize_safe_to_run != "true" ) && ( $array['MAX_LOAD'] <= get_load())) { + $color = get_color(); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.7 'echo \"\033[38;5;\"$color\"m\n$panes1[7] Disabled by MAX_LOAD\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } elseif ( $optimize_safe_to_run == "true" ) { + $color = get_color(); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.7 'echo \"\033[38;5;\"$color\"m\n$panes1[7] Disabled by OPTIMIZE\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } + //run $_php fix_prodji_releases.php in 1.8 + if (( $array['MAX_LOAD'] >= get_load()) && ((( TIME() - $time17 ) >= $array['FIX_TIMER'] ) || ( $i == 15 )) && ( $array['FIX_PRODJI'] == "true" ) && ( $optimize_safe_to_run != "true" )) { + $color = get_color(); + $log = writelog($panes1[8]); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.8 'echo \"\033[38;5;\"$color\"m\" && $ds1 $panes1[8] $ds2 && cd $_cj && $_php fix_prodji_releases.php 2>&1 $log && $ds1 $panes1[8] $ds3' 2>&1 1> /dev/null"); + $time17 = TIME(); + } elseif (( $array['FIX_PRODJI'] != "true" ) && ( $optimize_safe_to_run != "true" )) { + $color = get_color(); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.8 'echo \"\033[38;5;\"$color\"m\n$panes1[8] Disabled by FIX_TIMER\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } elseif (( $optimize_safe_to_run != "true" ) && ( $array['MAX_LOAD'] >= get_load())) { + $color = get_color(); + $run_time = relativeTime( $array['FIX_TIMER'] + $time17 ); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.8 'echo \"\033[38;5;\"$color\"m\n$panes1[8] will run in T[ $run_time]\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } elseif (( $optimize_safe_to_run != "true" ) && ( $array['MAX_LOAD'] <= get_load())) { + $color = get_color(); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.8 'echo \"\033[38;5;\"$color\"m\n$panes1[8] Disabled by MAX_LOAD\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } elseif ( $optimize_safe_to_run == "true" ) { + $color = get_color(); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.8 'echo \"\033[38;5;\"$color\"m\n$panes1[8] Disabled by OPTIMIZE\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } + //run $_php remove_blacklist_releases.php in 1.9 + if (( $array['MAX_LOAD'] >= get_load()) && ((( TIME() - $time17 ) >= $array['FIX_TIMER'] ) || ( $i == 15 )) && ( $array['FIX_BLACKLIST'] == "true" ) && ( $optimize_safe_to_run != "true" )) { + $color = get_color(); + $log = writelog($panes1[9]); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.9 'echo \"\033[38;5;\"$color\"m\" && $ds1 $panes1[9] $ds2 && cd $_cj && $_php remove_blacklist_releases.php 2>&1 $log && $ds1 $panes1[9] $ds3' 2>&1 1> /dev/null"); + $time17 = TIME(); + } elseif (( $array['FIX_BLACKLIST'] != "true" ) && ( $optimize_safe_to_run != "true" )) { + $color = get_color(); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.9 'echo \"\033[38;5;\"$color\"m\n$panes1[9] Disabled by FIX_TIMER\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } elseif (( $optimize_safe_to_run != "true" ) && ( $array['MAX_LOAD'] >= get_load())) { + $color = get_color(); + $run_time = relativeTime( $array['FIX_TIMER'] + $time17 ); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.9 'echo \"\033[38;5;\"$color\"m\n$panes1[9] will run in T[ $run_time]\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } elseif (( $optimize_safe_to_run != "true" ) && ( $array['MAX_LOAD'] <= get_load())) { + $color = get_color(); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.9 'echo \"\033[38;5;\"$color\"m\n$panes1[8] Disabled by MAX_LOAD\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } elseif ( $optimize_safe_to_run == "true" ) { + $color = get_color(); + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:1.9 'echo \"\033[38;5;\"$color\"m\n$panes1[9] Disabled by OPTIMIZE\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); + } //runs postprocess_nfo.php in pane 4.0 once if needed then exits if (( $array['MAX_LOAD'] >= get_load()) && ( $nfo_remaining_now > 0 ) && ( $array['NFOS'] != "0" ) && ( $optimize_safe_to_run != "true" )) { $color = get_color(); diff --git a/bin/scripts/check_vars.sh b/bin/scripts/check_vars.sh index 7ed5c4cce..e3ba32a5a 100755 --- a/bin/scripts/check_vars.sh +++ b/bin/scripts/check_vars.sh @@ -11,7 +11,7 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" source defaults.sh -for vars in RUNNING USE_TWO_NNTP USE_TWO_PP TVRAGE OTHERS UNWANTED KEEP_KILLED SEQUENTIAL BINARIES BINARIES_THREADS BACKFILL BACKFILL_THREADS KEVIN_SAFER KEVIN_BACKFILL_PARTS KEVIN_THREADED IMPORT NZB_THREADS IMPORT_TRUE MISC_ONLY RELEASES OPTIMIZE OPTIMIZE_KILL INNODB FIX_DROID PREDB SPOTNAB TV_SCHEDULE SPHINX KILL_QUIET DELETE_PARTS FIX_POSIX USE_HTOP USE_BWMNG USE_MYTOP USE_ATOP USE_NMON USE_IOTOP USE_VNSTAT USE_TCPTRACK USE_TOP USE_IFTOP USE_CONSOLE POWERLINE EN_IMDB RAMDISK CHOWN_TRUE WRITE_LOGS +for vars in RUNNING USE_TWO_NNTP USE_TWO_PP TVRAGE OTHERS UNWANTED KEEP_KILLED SEQUENTIAL BINARIES BINARIES_THREADS BACKFILL BACKFILL_THREADS KEVIN_SAFER KEVIN_BACKFILL_PARTS KEVIN_THREADED IMPORT NZB_THREADS IMPORT_TRUE MISC_ONLY RELEASES OPTIMIZE OPTIMIZE_KILL INNODB FIX_DROID FIX_CORE FIX_PRODJI FIX_BLACKLIST PREDB SPOTNAB TV_SCHEDULE SPHINX KILL_QUIET DELETE_PARTS FIX_POSIX USE_HTOP USE_BWMNG USE_MYTOP USE_ATOP USE_NMON USE_IOTOP USE_VNSTAT USE_TCPTRACK USE_TOP USE_IFTOP USE_CONSOLE POWERLINE EN_IMDB RAMDISK CHOWN_TRUE WRITE_LOGS do #echo $vars=\"${!vars}\" if [[ ${!vars} != "true" && ${!vars} != "false" ]]; then diff --git a/config.sh b/config.sh index ed81ed3d1..f73cd1e0e 100644 --- a/config.sh +++ b/config.sh @@ -300,6 +300,18 @@ export INNODB="false" #choose to use cj's fix_android_releases.php export FIX_DROID="false" +#choose to use cj's fix_core_releases.php +export FIX_CORE="false" + +#choose to use cj's fix_prodji_releases.php +export FIX_PRODJI="false" + +#choose to use cj's remove_blacklist_releases.php +export FIX_BLACKLIST="false" + +#How often to run this scripts in seconds +export FIX_TIMER="3600" + ############################################################ diff --git a/nnscripts/lib/Getopt.php b/nnscripts/lib/Getopt.php index cd94dd7ad..876b9f33a 100644 --- a/nnscripts/lib/Getopt.php +++ b/nnscripts/lib/Getopt.php @@ -429,4 +429,3 @@ class Getopt { return preg_split("//u", $str, -1, PREG_SPLIT_NO_EMPTY); } } - diff --git a/nnscripts/lib/nnscripts.php b/nnscripts/lib/nnscripts.php index 66d048e76..b5cb9ee6a 100644 --- a/nnscripts/lib/nnscripts.php +++ b/nnscripts/lib/nnscripts.php @@ -1,10 +1,16 @@ parseIniFile( $settingsFile, true ); // Parse the "global" settings @@ -588,4 +594,4 @@ abstract class NNScripts if( true === $show ) $this->display( PHP_EOL ); } -} +} \ No newline at end of file diff --git a/nnscripts/settings.ini b/nnscripts/settings.ini index fe91baee5..88f2865e0 100644 --- a/nnscripts/settings.ini +++ b/nnscripts/settings.ini @@ -8,13 +8,21 @@ display = true ;display = false ;limit = 36 +[fix_prodji_releases] +;display = false +;limit = 36 + +[fix_core_releases] +;display = false +;limit = 36 + [remove_blacklist_releases] ;display = false ;limit = 36 ;limit = false ;full = true ;debug = true -remove = false +remove = true [remove_category_releases] ;display = false @@ -32,4 +40,3 @@ remove = false [update_missing_movie_info] ;display = false - diff --git a/start.sh b/start.sh index b626a797f..967f68d83 100755 --- a/start.sh +++ b/start.sh @@ -61,6 +61,11 @@ else $TMUXCMD selectp -t 4 $TMUXCMD splitw -v -p 75 'printf "\033]2;sphinx\033\\"' $TMUXCMD splitw -v -p 67 'printf "\033]2;delete_parts\033\\"' + $TMUXCMD splitw -v -p 50 'printf "\033]2;update_missing_movie_info\033\\"' + $TMUXCMD splitw -v -p 50 'printf "\033]2;fix_android_releases\033\\"' + $TMUXCMD splitw -v -p 50 'printf "\033]2;fix_core_releases\033\\"' + $TMUXCMD splitw -v -p 50 'printf "\033]2;fix_prodji_releases\033\\"' + $TMUXCMD splitw -v -p 50 'printf "\033]2;remove_blacklist_releases\033\\"' $TMUXCMD new-window -n post1a 'printf "\033]2;postprocessing[01]\033\\"' $TMUXCMD selectp -t 0