From bb0c0fb31b270fac4af8b7bdc2d69876a2df1bc5 Mon Sep 17 00:00:00 2001 From: jonnyboy Date: Tue, 8 Jan 2013 08:41:39 -0500 Subject: [PATCH] merging with kevin's lost some of my changes, putting them back in --- bin/cleanup_scripts.sh | 2 -- bin/postProcessing1.sh | 1 - bin/postProcessing2.sh | 1 - bin/postProcessing3.sh | 1 - bin/postProcessing4.sh | 1 - bin/postProcessing5.sh | 2 -- bin/postProcessing6.sh | 1 - bin/processGames.php | 2 +- bin/processMusic.php | 2 +- bin/processTv.php | 2 +- bin/workhorse.sh | 24 ++++++++++++++++-------- start.sh | 15 +++++++++++++++ 12 files changed, 34 insertions(+), 20 deletions(-) diff --git a/bin/cleanup_scripts.sh b/bin/cleanup_scripts.sh index c7db99aa2..3241828af 100755 --- a/bin/cleanup_scripts.sh +++ b/bin/cleanup_scripts.sh @@ -67,5 +67,3 @@ echo "waiting $NEWZNAB_POST_SLEEP_TIME seconds..." sleep $NEWZNAB_POST_SLEEP_TIME done - -exit diff --git a/bin/postProcessing1.sh b/bin/postProcessing1.sh index ea8c23339..607f47469 100755 --- a/bin/postProcessing1.sh +++ b/bin/postProcessing1.sh @@ -10,4 +10,3 @@ do $PHP processBooks.php done -exit diff --git a/bin/postProcessing2.sh b/bin/postProcessing2.sh index 7952356c0..864e107de 100755 --- a/bin/postProcessing2.sh +++ b/bin/postProcessing2.sh @@ -10,4 +10,3 @@ do $PHP processGames.php done -exit diff --git a/bin/postProcessing3.sh b/bin/postProcessing3.sh index bf6682439..b77a2ab86 100755 --- a/bin/postProcessing3.sh +++ b/bin/postProcessing3.sh @@ -10,4 +10,3 @@ do $PHP processMovies.php done -exit diff --git a/bin/postProcessing4.sh b/bin/postProcessing4.sh index 4612aa6bc..2d4672cdd 100755 --- a/bin/postProcessing4.sh +++ b/bin/postProcessing4.sh @@ -10,4 +10,3 @@ do $PHP processMusic.php done -exit diff --git a/bin/postProcessing5.sh b/bin/postProcessing5.sh index be32a8b59..6c39b0349 100755 --- a/bin/postProcessing5.sh +++ b/bin/postProcessing5.sh @@ -10,5 +10,3 @@ do $PHP processTv.php done -exit - diff --git a/bin/postProcessing6.sh b/bin/postProcessing6.sh index 26f7a689a..079476ca3 100755 --- a/bin/postProcessing6.sh +++ b/bin/postProcessing6.sh @@ -10,4 +10,3 @@ do $PHP processOthers.php done -exit diff --git a/bin/processGames.php b/bin/processGames.php index 770068044..d4feb941e 100755 --- a/bin/processGames.php +++ b/bin/processGames.php @@ -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); } } diff --git a/bin/processMusic.php b/bin/processMusic.php index 78b387c5d..0b432d3a1 100755 --- a/bin/processMusic.php +++ b/bin/processMusic.php @@ -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); } } diff --git a/bin/processTv.php b/bin/processTv.php index e79c2e836..8b9fee140 100755 --- a/bin/processTv.php +++ b/bin/processTv.php @@ -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); } } diff --git a/bin/workhorse.sh b/bin/workhorse.sh index 504e76df2..cd86525cd 100755 --- a/bin/workhorse.sh +++ b/bin/workhorse.sh @@ -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 diff --git a/start.sh b/start.sh index 1a86e61e4..3bb8a14ec 100755 --- a/start.sh +++ b/start.sh @@ -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