changeset 18:7b337be4052d

updated launcher helping script
author souliane <souliane@mailoo.org>
date Thu, 18 Sep 2014 12:35:43 +0200
parents c6824592e3ef
children dc5240f4b7b2
files scripts/launcher/launch.sh
diffstat 1 files changed, 15 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/launcher/launch.sh	Wed Sep 17 20:38:18 2014 +0200
+++ b/scripts/launcher/launch.sh	Thu Sep 18 12:35:43 2014 +0200
@@ -87,7 +87,7 @@
 }
 start_ser() {
     echo "############# Starting Prosody ############"
-    cd $PROSODY && ./prosodyctl start
+    cd $PROSODY && ./prosodyctl start &
     echo "########## Installing sat_pubsub ##########"
     cd $SATPUBSUB && sudo python setup.py install
     echo "########### Starting sat-pubsub ###########"
@@ -158,8 +158,16 @@
     SAT_BRIDGE_CONST_INT_PREFIX='"org.goffi.sat_main"' ./bridge_constructor.py --force && cp generated/DBus.py ../DBus.py
     SAT_BRIDGE_CONST_INT_PREFIX='"org.goffi.sat_main"' ./bridge_constructor.py -s frontend  --force && cp generated/DBus.py ../../../frontends/src/bridge/DBus.py
 }
-monitor() {
-    echo "## Monitoring DBus for SàT main instance ##"
+monitor_core() {
+    echo "## Monitoring DBus for SàT dev instance - core ##"
+    dbus-monitor "sender='org.goffi.SAT', interface='org.goffi.SAT.core'"
+}
+monitor_plugin() {
+    echo "## Monitoring DBus for SàT dev instance - plugin ##"
+    dbus-monitor "sender='org.goffi.SAT', interface='org.goffi.SAT.plugin'"
+}
+monitor_main() {
+    echo "## Monitoring DBus for SàT main instance (redirected to /tmp/...) ##"
     killall -q dbus-monitor
     nohup dbus-monitor "sender='org.goffi.sat_main', interface='org.goffi.sat_main.core'" >> /tmp/sat_xml_core_`date +%y.%m.%d`&
     nohup dbus-monitor "sender='org.goffi.sat_main', interface='org.goffi.sat_main.plugin'" >> /tmp/sat_xml_plugin_`date +%y.%m.%d`&
@@ -179,8 +187,10 @@
     clean) clean ;;
     purge) clean && purge;;
     main) main ;;
-    bridge) bridge;;
-    monitor) monitor;;
+    bridge) bridge ;;
+    monitor_core) monitor_core ;;
+    monitor_plugin) monitor_plugin ;;
+    monitor_main) monitor_main ;;
     *)
         # default: reinstall and restart all
         stop_lib && stop_sat && stop_ser