diff --git a/bin/monitor.php b/bin/monitor.php index 2bc48d4..a1dea6c 100644 --- a/bin/monitor.php +++ b/bin/monitor.php @@ -2,7 +2,7 @@ require(dirname(__FILE__)."/config.php"); require(WWW_DIR.'/lib/postprocess.php'); -$version="0.1r784"; +$version="0.1r785"; $db = new DB(); @@ -1078,7 +1078,7 @@ function writelog( $pane ) $f=$h*200; $j=$g*1; $color = get_color(); - $log = writelog($panes2[$h]); + $log = writelog($panes3[$h]); if (( $array['MAX_LOAD'] >= get_load()) && ( $array['POST_TO_RUN_B'] >= $g ) && ( $work_remaining_now > $f ) && ( $optimize_safe_to_run != "true" )) { shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:3.$h 'echo \"\033[38;5;\"$color\"m\" && $ds1 $panes3[$h] $ds2 && cd $_temp && $_php processAdditional$k.php 2>&1 $log && echo \" \033[1;0;33m\" && $ds1 $panes3[$h] $ds3' 2>&1 1> /dev/null"); } elseif (( $array['POST_TO_RUN_B'] >= $g ) && ( $work_remaining_now <= $f ) && ( $optimize_safe_to_run != "true" )) { diff --git a/bin/nzb-import-sub.php b/bin/nzb-import-sub.php index b51b422..70b0552 100644 --- a/bin/nzb-import-sub.php +++ b/bin/nzb-import-sub.php @@ -29,7 +29,7 @@ $ps = new PowerProcess; $ps->RegisterCallback('psUpdateComplete'); -$ps->maxThreads = 5; +$ps->maxThreads = 2; $ps->tickCount = 50000; $ps->threadTimeLimit = 0; $selected = $subdir_count - 1; diff --git a/bin/safer_backfill_parts.php b/bin/safer_backfill_parts.php index 49ce095..8e44488 100644 --- a/bin/safer_backfill_parts.php +++ b/bin/safer_backfill_parts.php @@ -51,7 +51,7 @@ function relativeTime($_time) { $db = new DB; echo "Starting kevin123's safer backfill process\n\n"; -$query = $db->queryOneRow(sprintf("select name from groups WHERE (first_record_postdate BETWEEN '${_date}' and now()) and (active = 1) order by name ASC")); +$query = $db->query(sprintf("select name from groups WHERE (first_record_postdate BETWEEN '${_date}' and now()) and (active = 1) order by name ASC limit 1")); $groupPost = $_parts; $groupName = $query['name']; diff --git a/conf/jonnyboys_defaults.sh b/conf/jonnyboys_defaults.sh index 43682e0..db27477 100644 --- a/conf/jonnyboys_defaults.sh +++ b/conf/jonnyboys_defaults.sh @@ -21,7 +21,7 @@ export NICENESS="10" #for example, if you set load to 2, no pane will start when your system load exceeds 2 #this does not mean the the desired load will not be exceeded, just that no panes will be be restarted #this one is for all panes except update_releases -export MAX_LOAD="5.5" +export MAX_LOAD="15.5" #this one is for update_releases export MAX_LOAD_RELEASES="7.0" @@ -46,10 +46,10 @@ export ADMIN_PATH=$NEWZPATH"/www/admin" #At some point, increasing this begins to slow things down. It will need to be adjusted for your system #to get the desired performance, 0 will disable all post processing, but not category processing #the first window has up to 16 postprocess and can use primary or alternate NNTP provider -export POST_TO_RUN_A="13" +export POST_TO_RUN_A="16" #The second window also has 16 processes and can use promary or alternate NNTP provider -export POST_TO_RUN_B="0" +export POST_TO_RUN_B="16" #by modifying www/config.php like http://pastebin.com/VgH9DCZw, you can use 1 provider to run update_binaries #and backup and another provider to run post processing with. Or, 1 provider to run up to 16 postprocesses and another to run @@ -60,11 +60,11 @@ export POST_TO_RUN_B="0" #this one sets 1 provider for everything(false), or first provider for update_binaries and backfill and another for postprocessing(true) #this can not be changed after starting scripts -export USE_TWO_NNTP="false" +export USE_TWO_NNTP="true" #this allows you split the 32 postprocessing into 2 separate providers #this can not be changed after starting scripts -export USE_TWO_PP="false" +export USE_TWO_PP="true" ############################################################ @@ -231,7 +231,7 @@ export IMPORT="false" export NZB_THREADS="true" #How many nzbs to import per loop, if using NZB_THREADS=true the per folder -export NZBCOUNT="5" +export NZBCOUNT="2" #Set, in seconds - how long the nzb-import should sleep between runs #below backfill @@ -257,7 +257,7 @@ export MISC_ONLY="false" ############################################################ #Create releases, this is really only necessary to turn off when you only want to post process -export RELEASES="true" +export RELEASES="false" #Set, in seconds - how long the update_release should sleep between runs #bottom right @@ -320,10 +320,10 @@ export PARSING_MOD="true" export FIX_DROID="true" #run update_parsing.php against the whole db or just the last 24 hours -export PAST_24_HOURS="false" +export PAST_24_HOURS="true" #How often do you want update_parsing.php to run, in seconds. this takes alot of memory and processing time, default is every 12 hrs -export PARSING_TIMER="43200" +export PARSING_TIMER="900" ############################################################ @@ -493,7 +493,7 @@ export RAMDISK_PATH="/" ########################################################### #logs can be written, per pane, to the logs folder -export WRITE_LOGS="true" +export WRITE_LOGS="false" ########################################################### diff --git a/scripts/binaryblacklist.sql b/scripts/binaryblacklist.sql index 931b983..06d6eaf 100644 --- a/scripts/binaryblacklist.sql +++ b/scripts/binaryblacklist.sql @@ -22,6 +22,7 @@ INSERT INTO `binaryblacklist` (`ID`, `groupname`, `regex`, `msgcol`, `optype`, ` (100005, 'alt.binaries.*', '[ -._](4u\\.nl|nov[ a]+rip|realco|videomann|vost)[ -._]', 1, 1, 0, 'Blacklists non-english (release group specific) releases.'), (100006, 'alt.binaries.*', '[ -.]((bd|dl)mux|doku|\\[foreign\\]|seizoen|staffel)[ -.]', 1, 1, 0, 'Blacklists non-english (lang specific) releases.'), (100020, 'alt.binaries.*', '[ -.](imageset|pictureset|xxx)[ -.]', 1, 1, 0, 'Blacklists porn releases.'), +(100025, 'alt.binaries.*', 'hdnectar|nzbcave', 1, 1, 0, 'Bad releases.'), (100030, 'alt.binaries.*', '[ -](de|es|fr|it|ko|nl|pl|se)[ -]((audiobook|cuefix|bonus|bootleg|dirfix|nfofix|dvb|promo|readnfo|real|rerip|repack|proper)[ -])?\\d?(bluray|hddvd|dvd|ddc|cd(s|rs|rep)?|mcd|(\\d_)?(vls|m?lp|ep|vinyl))', 1, 1, 0, 'Blacklists music, music video etc releases.'), (100040, 'alt.binaries.*', '[ -.](espn|ultimate.?fighter|mlb|mls|mfc|mma|ncaa|nba|nbl|nfl|nhl|pga|tna|ufc|us.?open|wec|wcw|world.?series|wwe|wwf)[ -.].*((480|720|1080)(i|p)|(d|h|p|s)d?tv|divx|(dvd.?|sat|vhs)rip|(h|x).?264|vcd|xvi ?d)', 1, 1, 0, 'Blacklists american and canadian sports releases.'), (100041, 'alt.binaries.*', '[ -.](anz|bundesliga|cfb|epl|fa.?cup|la.?liga|netball|nrl|rugby|serie.?a|supercup|super.?league|uefa|wimbledon)[ -.].*((480|720|1080)(i|p)|(d|h|p|s)d?tv|divx|(dvd.?|sat|vhs)rip|(h|x).?264|xvid)', 1, 1, 0, 'Blacklists european sports releases.'),