diff options
Diffstat (limited to 'yarns.webapp/900-implementations.yarn')
| -rw-r--r-- | yarns.webapp/900-implementations.yarn | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/yarns.webapp/900-implementations.yarn b/yarns.webapp/900-implementations.yarn index 4f87be9..859bb40 100644 --- a/yarns.webapp/900-implementations.yarn +++ b/yarns.webapp/900-implementations.yarn @@ -24,41 +24,10 @@ but the shell doesn't wait for it to terminate. This way, WEBAPP will be running until it crashes or is explicitly killed. IMPLEMENTS GIVEN a running WEBAPP - rm -f "$DATADIR/webapp.pid" - rm -f "$DATADIR/webapp.port" - mkfifo "$DATADIR/webapp.port" + start_webapp - add_to_config_file "$DATADIR/webapp.conf" \ - statedb "$DATADIR/webapp.db" - add_to_config_file "$DATADIR/webapp.conf" \ - status-html "$DATADIR/lc-status.html" - add_to_config_file "$DATADIR/webapp.conf" \ - log "$DATADIR/webapp.log" - add_to_config_file "$DATADIR/webapp.conf" \ - log-level debug - add_to_config_file "$DATADIR/webapp.conf" \ - debug-host 127.0.0.1 - add_to_config_file "$DATADIR/webapp.conf" \ - debug-port-file "$DATADIR/webapp.port" - add_to_config_file "$DATADIR/webapp.conf" \ - static-files "$SRCDIR/static" - add_to_config_file "$DATADIR/webapp.conf" \ - templates "$SRCDIR/templates" - add_to_config_file "$DATADIR/webapp.conf" \ - debug-real-confgit no - - start-stop-daemon -S -x "$SRCDIR/lorry-controller-webapp" \ - -b -p "$DATADIR/webapp.pid" -m --verbose \ - -- \ - --config "$DATADIR/webapp.conf" - - port=$(cat "$DATADIR/webapp.port") - rm -f "$DATADIR/webapp.port" - echo "$port" >"$DATADIR/webapp.port" - - # Wait for the WEBAPP to actually be ready, i.e., that it's - # listening on its assigned port. - "$SRCDIR/test-wait-for-port" 127.0.0.1 "$port" + IMPLEMENTS WHEN WEBAPP is started + start_webapp Kill the running WEBAPP, using the recorded PID. We need to do this both as a WHEN and a FINALLY step. |