Skip to content

Commit c87f0ec

Browse files
add supervisord to keep processes alive (#30)
1 parent fac44f5 commit c87f0ec

File tree

4 files changed

+44
-12
lines changed

4 files changed

+44
-12
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
// Runs automatically after Prebuild Template environment is created.
1010
"onCreateCommand": ".devcontainer/onCreate.sh",
1111
// Runs automatically every time the dev container has been (re-)started
12-
"postStartCommand": {
13-
"tools": ".devcontainer/postStartCommand.sh",
14-
"welcome-mat": "echo Welcome to Spark!"
15-
},
12+
"postStartCommand": ".devcontainer/postStartCommand.sh",
1613
"customizations": {
1714
"codespaces": {
1815
"onStopCommand": "REVISION_NAME=spark-preview /usr/local/bin/deploy.sh"

.devcontainer/onCreate.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,6 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
2626

2727
echo "Pre-starting the server and generating the optimized assets"
2828
npm run optimize --override
29+
30+
echo "Installing supervisor"
31+
sudo apt update && sudo apt install -y supervisor

.devcontainer/postStartCommand.sh

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@
33
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
44
"$SCRIPT_DIR/refreshTools.sh"
55

6-
USE_DESIGNER=true USE_SPARK_AGENT=true npm run dev &
7-
proxy.js &
8-
spark-server &
9-
spark-agent &
10-
spark-designer &
11-
spark-file-syncer 13000 >> /tmp/.spark-file-syncer.log 2>&1 &
6+
sudo cp .devcontainer/spark.conf /etc/supervisor/conf.d/
127

13-
echo "Spark tools started successfully"
8+
sudo service supervisor start
9+
sudo supervisorctl reread
10+
sudo supervisorctl update
1411

15-
wait

.devcontainer/spark.conf

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
[program:vite]
2+
command=npm run dev
3+
directory=/workspaces/spark-template
4+
autostart=true
5+
autorestart=true
6+
stdout_logfile=/var/log/vite.out.log
7+
stderr_logfile=/var/log/vite.err.log
8+
9+
[program:proxy]
10+
command=/usr/local/bin/proxy.js
11+
autostart=true
12+
autorestart=true
13+
stdout_logfile=/var/log/proxy.out.log
14+
stderr_logfile=/var/log/proxy.err.log
15+
16+
[program:spark-server]
17+
command=/usr/local/bin/spark-server
18+
autostart=true
19+
autorestart=true
20+
stdout_logfile=/var/log/spark-server.out.log
21+
stderr_logfile=/var/log/spark-server.err.log
22+
environment=LOG_FILE=/var/log/spark-server.log
23+
24+
[program:spark-designer]
25+
command=/usr/local/bin/spark-designer
26+
autostart=true
27+
autorestart=true
28+
stdout_logfile=/var/log/spark-designer.out.log
29+
stderr_logfile=/var/log/spark-designer.err.log
30+
31+
[program:spark-file-syncer]
32+
command=/usr/local/bin/spark-file-syncer 13000
33+
autostart=true
34+
autorestart=true
35+
stdout_logfile=/var/log/spark-file-syncer.out.log
36+
stderr_logfile=/var/log/spark-file-syncer.err.log

0 commit comments

Comments
 (0)