Peter M. Groen / knowledgetree

Commit 294825856814149b1e4357b2a9eaadcf29249486

Authored by kevin_fourie
1 parent 4b149a77

Merged in from DEV trunk... 

KTS-2568
"Add scheduler service to Linux"
Updated. Fixed script error relating to stopping services.

Committed By: Kevin Fourie
Reviewed By: Conrad Vermeulen


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@7580 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 6 additions and 5 deletions
examples/linux/init/dmsctl.sh
  View file @2948258
@@ -60,10 +60,10 @@ LUCENE="$JAVABIN -jar ktlucene.jar" @@ -60,10 +60,10 @@ LUCENE="$JAVABIN -jar ktlucene.jar"
60 LUCENE_STATUS="" 60 LUCENE_STATUS=""
61 61
62 # Scheduler 62 # Scheduler
63 -SCHEDULER_PATH="$INSTALL_PATH/knowledgeTree/bin/"  
64 -SCHEDULER_PIDFILE=$INSTALL_PATH/knowledgeTree/bin/scheduler.pid 63 +SCHEDULER_PATH="$INSTALL_PATH/bin/"
  64 +SCHEDULER_PIDFILE=$INSTALL_PATH/bin/scheduler.pid
65 SCHEDULER_PID="" 65 SCHEDULER_PID=""
66 -SCHEDULERBIN="$INSTALL_PATH/knowledgeTree/bin/taskrunner.sh" 66 +SCHEDULERBIN="$INSTALL_PATH/bin/schedulerTask.sh"
67 SCHEDULER="$SCHEDULERBIN" 67 SCHEDULER="$SCHEDULERBIN"
68 SCHEDULER_STATUS="" 68 SCHEDULER_STATUS=""
69 69
@@ -353,7 +353,7 @@ if [ $USEXVFB -eq 1 ]; then @@ -353,7 +353,7 @@ if [ $USEXVFB -eq 1 ]; then
353 fi 353 fi
354 fi 354 fi
355 get_xvfb_pid 355 get_xvfb_pid
356 - if killall $XVFBBIN ; then 356 + if kill $XVFB_PID ; then
357 echo "$0 $ARG: Xvfb stopped" 357 echo "$0 $ARG: Xvfb stopped"
358 else 358 else
359 echo "$0 $ARG: Xvfb could not be stopped" 359 echo "$0 $ARG: Xvfb could not be stopped"
@@ -455,6 +455,7 @@ start_scheduler() { @@ -455,6 +455,7 @@ start_scheduler() {
455 if [ $RUNNING -eq 1 ]; then 455 if [ $RUNNING -eq 1 ]; then
456 echo "$0 $ARG: scheduler (pid $SCHEDULER_PID) already running" 456 echo "$0 $ARG: scheduler (pid $SCHEDULER_PID) already running"
457 else 457 else
  458 + cd $SCHEDULER_PATH
458 $SCHEDULER >/dev/null 2>&1 & 459 $SCHEDULER >/dev/null 2>&1 &
459 if [ $? -eq 0 ]; then 460 if [ $? -eq 0 ]; then
460 echo "$0 $ARG: scheduler started" 461 echo "$0 $ARG: scheduler started"
@@ -481,7 +482,7 @@ stop_scheduler() { @@ -481,7 +482,7 @@ stop_scheduler() {
481 fi 482 fi
482 fi 483 fi
483 get_scheduler_pid 484 get_scheduler_pid
484 - if killall $SCHEDULERBIN ; then 485 + if kill $SCHEDULER_PID ; then
485 echo "$0 $ARG: schedulerstopped" 486 echo "$0 $ARG: schedulerstopped"
486 else 487 else
487 echo "$0 $ARG: scheduler could not be stopped" 488 echo "$0 $ARG: scheduler could not be stopped"