diff --git a/bin/monitor.php b/bin/monitor.php index 98753d612..e8a07cafa 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.1r772"; +$version="0.1r773"; $db = new DB(); diff --git a/conf/jonnyboys_defaults.sh b/conf/jonnyboys_defaults.sh index be0dbb223..6935275e2 100644 --- a/conf/jonnyboys_defaults.sh +++ b/conf/jonnyboys_defaults.sh @@ -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="8" +export POST_TO_RUN_A="4" #The second window also has 16 processes and can use promary or alternate NNTP provider -export POST_TO_RUN_B="16" +export POST_TO_RUN_B="0" #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 @@ -61,7 +61,7 @@ export POST_TO_RUN_B="16" export USE_TWO_NNTP="true" #this allows you split the 32 postprocessing into 2 separate providers -export USE_TWO_PP="true" +export USE_TWO_PP="truek" ############################################################ @@ -217,7 +217,7 @@ export KEVIN_PARTS="100000" export NZBS="/home/jonnyboy/nzb_files2" #Choose to run import nzb script true/false -export IMPORT="truef" +export IMPORT="true" #If, you have all of your nzbs in one folder select false #If, you have all of you nzbs split into separate in with the root at $NZBS then select true @@ -408,7 +408,7 @@ export USE_NMON="false" export USE_IOTOP="false" #define tcptrack user settings to apply at runtime -export USE_TCPTRACK="false" +export USE_TCPTRACK="truek" export TRCPTRACK_ARGS="-i eth0 port 563" #define vnstat user settings to apply at runtim @@ -492,7 +492,7 @@ export RAMDISK_PATH="/" ########################################################### #logs can be written, per pane, to the logs folder -export WRITE_LOGS="false" +export WRITE_LOGS="true" ########################################################### diff --git a/start.sh b/start.sh index adb5df5f0..eaf782265 100755 --- a/start.sh +++ b/start.sh @@ -146,7 +146,7 @@ else $SED -i -e "s/\/\/echo \"PostPrc : Fetching/echo \"PostPrc : Fetching/g" bin/lib/postprocess$c.php if [[ $USE_TWO_NNTP == "true" ]] && [[ $USE_TWO_PP != "true" ]]; then $SED -i -e "s/require_once(WWW_DIR.\"\/lib\/nntp.php\");/require(dirname(__FILE__).\"\/nntp2.php\");/g" bin/lib/postprocess$c.php - $SED -i -e "s/new Nntp;/new Nntp2;/g" bin/lib/postprocess$c.php + $SED -i -e "s/new Nntp;/new GetConnected;/g" bin/lib/postprocess$c.php $SED -i -e "s/doConnect/doConnect2/g" bin/lib/postprocess$c.php fi @@ -169,7 +169,7 @@ else $SED -i -e "s/\/\/echo \"PostPrc : Fetching/echo \"PostPrc : Fetching/g" bin/lib/postprocess$c.php if [[ $USE_TWO_NNTP == "true" ]] && [[ $USE_TWO_PP == "true" ]]; then $SED -i -e "s/require_once(WWW_DIR.\"\/lib\/nntp.php\");/require(dirname(__FILE__).\"\/nntp2.php\");/g" bin/lib/postprocess$c.php - $SED -i -e "s/new Nntp;/new Nntp2;/g" bin/lib/postprocess$c.php + $SED -i -e "s/new Nntp;/new GetConnected;/g" bin/lib/postprocess$c.php $SED -i -e "s/doConnect/doConnect2/g" bin/lib/postprocess$c.php fi @@ -193,7 +193,7 @@ else $SED -i -e "s/$numtoProcess = 100;/$numtoProcess = 20;/g" bin/lib/postprocess1.php if [[ $USE_TWO_NNTP == "true" ]] && [[ $USE_TWO_PP != "true" ]]; then $SED -i -e "s/require_once(WWW_DIR.\"\/lib\/nntp.php\");/require(dirname(__FILE__).\"\/nntp2.php\");/g" bin/lib/postprocess1.php - $SED -i -e "s/new Nntp;/new Nntp2;/g" bin/lib/postprocess1.php + $SED -i -e "s/new Nntp;/new GetConnected;/g" bin/lib/postprocess1.php $SED -i -e "s/doConnect/doConnect2/g" bin/lib/postprocess1.php fi @@ -215,7 +215,7 @@ else $SED -i -e "s/NNTP_PORT/NNTP_PORT2/g" bin/lib/nntp2.php $SED -i -e "s/NNTP_SSLENABLED/NNTP_SSLENABLED2/g" bin/lib/nntp2.php $SED -i -e "s/NNTPException/NNTPException2/g" bin/lib/nntp2.php - $SED -i -e "s/class Nntp/class Nntp2/g" bin/lib/nntp2.php + $SED -i -e "s/class Nntp/class GetConnected/g" bin/lib/nntp2.php $SED -i -e "s/500/250/" bin/lib/postprocess1.php $SED -i -e "s/500/250/" bin/lib/postprocess2.php