merging with kevin's lost some of my changes, putting them back in

This commit is contained in:
jonnyboy
2013-01-08 08:41:39 -05:00
parent a907e4e674
commit bb0c0fb31b
12 changed files with 34 additions and 20 deletions
-2
View File
@@ -67,5 +67,3 @@ echo "waiting $NEWZNAB_POST_SLEEP_TIME seconds..."
sleep $NEWZNAB_POST_SLEEP_TIME
done
exit
-1
View File
@@ -10,4 +10,3 @@ do
$PHP processBooks.php
done
exit
-1
View File
@@ -10,4 +10,3 @@ do
$PHP processGames.php
done
exit
-1
View File
@@ -10,4 +10,3 @@ do
$PHP processMovies.php
done
exit
-1
View File
@@ -10,4 +10,3 @@ do
$PHP processMusic.php
done
exit
-2
View File
@@ -10,5 +10,3 @@ do
$PHP processTv.php
done
exit
-1
View File
@@ -10,4 +10,3 @@ do
$PHP processOthers.php
done
exit
+1 -1
View File
@@ -27,7 +27,7 @@ while($i=1)
$postprocess = new PostProcess(true);
$postprocess->processGames();
} else {
printf("ConProc : no work to be done\n");
printf("ConsPrc : no work to be done\n");
sleep(15);
}
}
+1 -1
View File
@@ -27,7 +27,7 @@ while($i=1)
$postprocess = new PostProcess(true);
$postprocess->processMusic();
} else {
printf("MusProc : no work to be done\n");
printf("MusicPr : no work to be done\n");
sleep(15);
}
}
+1 -1
View File
@@ -27,7 +27,7 @@ while($i=1)
$postprocess = new PostProcess(true);
$postprocess->processTv();
} else {
printf("TVRage : no work to be done\n");
printf("TVRage : no work to be done\n");
sleep(15);
}
}
+16 -8
View File
@@ -17,8 +17,10 @@ if [ "$THREADS" == "true" -a "$INNODB" == "true" ]; then
fi
#make active groups current
cd $INNODB_PATH
[ -f update_binaries_threaded.php ] && $PHP update_binaries_threaded.php
if [[ $BINARIES == "true" ]] ; then
cd $INNODB_PATH
[ -f update_binaries_threaded.php ] && $PHP update_binaries_threaded.php
fi
#get backfill for all active groups
if [[ $BACKFILL == "true" ]] ; then
@@ -50,8 +52,10 @@ elif [ "$THREADS" != "true" -a "$INNODB" == "true" ]; then
fi
#make active groups current
cd $INNODB_PATH
[ -f update_binaries.php ] && $PHP update_binaries.php
if [[ $BINARIES == "true" ]] ; then
cd $INNODB_PATH
[ -f update_binaries.php ] && $PHP update_binaries.php
fi
#get backfill for all active groups
if [[ $BACKFILL == "true" ]] ; then
@@ -82,8 +86,10 @@ elif [ "$THREADS" == "true" -a "$INNODB" != "true" ]; then
fi
#make active groups current
cd $MYISAM_PATH
[ -f update_binaries_threaded.php ] && $PHP update_binaries_threaded.php
if [[ $BINARIES == "true" ]] ; then
cd $MYISAM_PATH
[ -f update_binaries_threaded.php ] && $PHP update_binaries_threaded.php
fi
#get backfill for all active groups
if [[ $BACKFILL == "true" ]] ; then
@@ -115,8 +121,10 @@ elif [ "$THREADS" != "true" -a "$INNODB" != "true" ]; then
fi
#make active groups current
cd $NEWZNAB_PATH
[ -f update_binaries.php ] && $PHP update_binaries.php
if [[ $BINARIES == "true" ]] ; then
cd $NEWZNAB_PATH
[ -f update_binaries.php ] && $PHP update_binaries.php
fi
#get backfill for all active groups
if [[ $BACKFILL == "true" ]] ; then
+15
View File
@@ -22,6 +22,20 @@ export INNODB_PATH=$DIR"/bin/innodb"
export MYISAM_PATH=$DIR"/bin/myisam"
export START_PATH=$DIR
#delete some files
[ -f bin/lib/postprocess4.php ];rm bin/lib/postprocess4.php
[ -f bin/processAlternate4.php ];rm bin/processAlternate4.php
[ -f bin/lib/postprocess5.php ];rm bin/lib/postprocess5.php
[ -f bin/processAlternate5.php ];rm bin/processAlternate5.php
[ -f bin/lib/postprocess6.php ];rm bin/lib/postprocess6.php
[ -f bin/processAlternate6.php ];rm bin/processAlternate6.php
[ -f bin/lib/postprocess7.php ];rm bin/lib/postprocess7.php
[ -f bin/processAlternate7.php ];rm bin/processAlternate7.php
$TMUX new-session -d -s NewzNab -n NewzNab 'echo "monitor Working......" && nice -n 19 $PHP bin/monitor.php && exec bash -i'
$TMUX selectp -t 0
$TMUX splitw -h -p 72 'cd bin && echo "Processing Books....." && sleep 12 && nice -n 19 ./postProcessing1.sh && exec bash -i'
@@ -60,6 +74,7 @@ if [[ $USE_MYTOP == "true" ]]; then
$TMUX new-window -n mytop '$MYTOP -u $DB_USER -p $DB_PASSWORD -d $DB_NAME -h $DB_HOST'
fi
$TMUX new-window -n Console 'bash -i'
$TMUX select-window -tNewzNab:0
$TMUX attach-session -d -tNewzNab