stackforge/billingstack
Code Issues Proposed changes

Cutdown on settings

Browse Source 
Change-Id: I5c062fcf9fef5847a4ff693c598308decb58c857
This commit is contained in:
Endre Karlson 2013-06-09 00:25:22 +02:00
parent 5d61c711a5
commit 1d5467962d
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/control.sh
View File

@ -10,16 +10,13 @@ XTRACE=$(set +o | grep xtrace)
set -x set -x
# Keep track of this directory # Keep track of this directory
TOOL_DIR=$(cd $(dirname "$0") && pwd) SCRIPT_DIR=$(cd $(dirname "$0") && pwd)
TOP_DIR=$TOOL_DIR/.. BASE_DIR=${BASE_DIR:-$SCRIPT_DIR/..}
RUN_DIR=$TOP_DIR/run SCREEN_NAME=${SCREEN_NAME:-billingstack}
SCREEN_LOGDIR=${SCREEN_LOGDIR:-$BASE_DIR/logs}
SCREEN_NAME=billingstack CONFIG=${CONFIG:-$BASE_DIR/etc/billingstack.conf}
SCREEN_LOGDIR=$RUN_DIR
CONF_DIR=$TOP_DIR/etc/billingstack
CONFIG=${CONFIG:-$CONF_DIR/billingstack.conf}
SERVICES="api,central,rater,biller,collector" SERVICES="api,central,rater,biller,collector"
@ -95,7 +92,7 @@ function run_process() {
# screen_it service "command-line" # screen_it service "command-line"
function screen_it { function screen_it {
SCREEN_NAME=${SCREEN_NAME:-stack} SCREEN_NAME=${SCREEN_NAME:-stack}
SERVICE_DIR=${SERVICE_DIR:-${RUN_DIR}/status} SERVICE_DIR=${SERVICE_DIR:-$BASE_DIR/status}
USE_SCREEN=$(trueorfalse True $USE_SCREEN) USE_SCREEN=$(trueorfalse True $USE_SCREEN)
if is_service_enabled $1; then if is_service_enabled $1; then
@ -199,11 +196,6 @@ function screen_destroy() {
} }
function prereq_setup() {
ensure_dir $RUN_DIR
}
function start_svc() { function start_svc() {
svc="$(echo "$1" | sed 's/bs-//')" svc="$(echo "$1" | sed 's/bs-//')"
echo "Starting service: $svc" echo "Starting service: $svc"