Mercurial > sat_docs
changeset 6:19448ad3a7d9
add big picture schema + fix launching script
| author | souliane <souliane@mailoo.org> |
|---|---|
| date | Wed, 16 Jul 2014 12:29:22 +0200 |
| parents | dfc5c6be7761 |
| children | b01ee1b28680 |
| files | schemas/bigpicture/sat_schema.odg schemas/bigpicture/sat_schema.pdf scripts/launcher/launch.sh |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/launcher/launch.sh Thu Jul 03 12:21:45 2014 +0200 +++ b/scripts/launcher/launch.sh Wed Jul 16 12:29:22 2014 +0200 @@ -22,7 +22,7 @@ SPS_PID=$SATPUBSUB/twistd.pid # Connection information for sat_pubsub -SPS_JID=sat-pubsub.souliane.org +SPS_JID=sat-pubsub.tazar.int SPS_PWD=password # Informations for a concurrent sat instance @@ -36,8 +36,8 @@ # 4 Firefox profiles names for testing FF_PROFILES=(test1 test2 test3 test4) -# 4 SàT profiles names for testing -SAT_PROFILES=(Peter Steven Dave Dino) +# 4 SÃ T profiles names for testing +SAT_PROFILES=(pierre elisee louise buenaventura) # Passwords for these profiles SAT_PROFILES_PASSWD=(xxxxxx xxxxxx xxxxxx xxxxxx) @@ -46,7 +46,7 @@ # Launch sat pubsub in debug mode? SPS_DEBUG=0 # Launch libervia in debug mode? -LIB_DEBUG=1 +LIB_DEBUG=0 # Force killing processes? KILL_FORCE=1 @@ -116,7 +116,7 @@ fi } 4foxes() { - # Starts 4 instances of firefox and connect SàT profiles with Libervia + # Starts 4 instances of firefox and connect SÃ T profiles with Libervia # Assumes the HTTPS port for local server is 8443 echo "####### Starting 4 libervia clients #######" for I in `seq 0 3`; do @@ -138,7 +138,7 @@ rm -rf $PACKAGES/libervia_server } main() { - echo "######## Starting SàT main instance #######" + echo "######## Starting SÃ T main instance #######" export PYTHONPATH=$SAT_MAIN/lib cd $SAT_MAIN/lib/sat && hg pull -u && ./sat.sh echo "#### Starting primitivus main instance ####" @@ -154,7 +154,7 @@ 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 ##" + echo "## Monitoring DBus for SÃ T main instance ##" 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`&