Code Review
/
ric-app
/
mc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Tweak unit test script to ensure LD paths are set
[ric-app/mc.git]
/
mc-core
/
container_start.sh
diff --git
a/mc-core/container_start.sh
b/mc-core/container_start.sh
index
1af09d4
..
b241ecd
100755
(executable)
--- a/
mc-core/container_start.sh
+++ b/
mc-core/container_start.sh
@@
-41,7
+41,12
@@
set -e
set -e
-SIMULATOR_MODE=`python /mc/extract_params.py $XAPP_DESCRIPTOR_PATH simulator_mode`
+FIFO_DIR="/tmp/mcl/fifos"
+
+SIMULATOR_MODE=`python /mc/extract_params.py ${XAPP_DESCRIPTOR_PATH}/config-file.json simulator_mode`
+RMR_PORT=`python /mc/extract_rmr_port.py ${XAPP_DESCRIPTOR_PATH}/config-file.json rmr-data`
+
+mkdir -p $FIFO_DIR
if [ "$SIMULATOR_MODE" != "true" ]
then
if [ "$SIMULATOR_MODE" != "true" ]
then
@@
-49,11
+54,11
@@
then
(
cd /playpen
(
cd /playpen
- if
(( $USE_NNG )) || [[ ! -f bin/mc_listener_si ]] # we really want the si version unless forced
+ if
[ "$RMR_PORT" != "" ]
then
then
- bin/mc_listener
+ bin/mc_listener
-p $RMR_PORT
else
else
- bin/mc_listener
_si
+ bin/mc_listener
fi
) >/tmp/listener.std 2>&1 &
fi
) >/tmp/listener.std 2>&1 &
@@
-61,6
+66,7
@@
echo "listener was started" >&2
fi
fi
+
# ---- finally, start the core MC application -----------------------------
cd ${GSLITE_ROOT:-/mc/gs-lite}/demo/queries
./runall
# ---- finally, start the core MC application -----------------------------
cd ${GSLITE_ROOT:-/mc/gs-lite}/demo/queries
./runall