From a4e10cb036ece78e616dff7a8064df1e00f3903a Mon Sep 17 00:00:00 2001 From: jonnyboy Date: Thu, 7 Mar 2013 03:27:49 +0100 Subject: [PATCH] fixed check-git.py, fixed a fix was killing nzbcount during optimization --- bin/monitor.php | 4 ++-- scripts/check_git.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/monitor.php b/bin/monitor.php index e470be4eb..bb4d57f0a 100644 --- a/bin/monitor.php +++ b/bin/monitor.php @@ -602,7 +602,7 @@ while( $i > 0 ) $optimize_run="false"; } } elseif ((( TIME() - $time6 >= $array['MYISAM_LARGE'] ) || ( TIME() - $time8 >= $array['INNODB_LARGE'] ) || ( TIME() - $time5 >= $array['INNODB_SMALL'] ) || ( TIME() - $time11 >= $array['MYISAM_SMALL'] )) && ( $array['OPTIMIZE_KILL'] == "true" ) && ( $array['OPTIMIZE'] == "true" )) { - for ($g=1; $g<=5; $g++) + for ($g=2; $g<=5; $g++) { $color = get_color(); shell_exec("$_tmux respawnp -k -t {$array['TMUX_SESSION']}:0.$g 'echo \"\033[38;5;\"$color\"m\n$panes0[$g]\nKilled in prep for \nOptimization\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); @@ -636,7 +636,7 @@ while( $i > 0 ) $optimize_run="false"; } } elseif ((( TIME() - $time6 >= $array['MYISAM_LARGE'] ) || ( TIME() - $time11 >= $array['MYISAM_SMALL'] )) && ( $array['OPTIMIZE_KILL'] == "true" ) && ( $array['OPTIMIZE'] == "true" )) { - for ($g=1; $g<=5; $g++) + for ($g=2; $g<=5; $g++) { $color = get_color(); shell_exec("$_tmux respawnp -k -t {$array['TMUX_SESSION']}:0.$g 'echo \"\033[38;5;\"$color\"m\n$panes0[$g]\nKilled in prep for \nOptimization\" && date +\"%D %T\" && echo \"This is color #$color\"' 2>&1 1> /dev/null"); diff --git a/scripts/check_git.py b/scripts/check_git.py index b1df39f28..26daaa22b 100755 --- a/scripts/check_git.py +++ b/scripts/check_git.py @@ -47,7 +47,7 @@ def gitCurrentVersion(): return current_commit def latestCommit(): - url = 'https://api.github.com/repos/jonnyboy/newznab-tmux/commits/dev' + url = 'https://api.github.com/repos/jonnyboy/newznab-tmux/commits/master' result = urllib2.urlopen(url).read() git = json.JSONDecoder().decode(result) return git['sha']