Skip to content

Commit

Permalink
feat: Bundle all session related logs in /var/log/session
Browse files Browse the repository at this point in the history
A central log location makes the log collection easier.
  • Loading branch information
MoritzWeber0 committed Feb 18, 2025
1 parent 5f3b32d commit 9b6a908
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 11 deletions.
4 changes: 2 additions & 2 deletions capella/autostart
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ then
if [ "$RESTART_CAPELLA" = "1" ];
then
# Run capella in a loop:
( while true; do /opt/capella/capella -data ${WORKSPACE_DIR:-/workspace} > /var/log/capella.stdout.log 2> /var/log/capella.stderr.log; sleep 1; done ) &
( while true; do /opt/capella/capella -consoleLog -data ${WORKSPACE_DIR:-/workspace} > /var/log/capella.stdout.log 2> /var/log/capella.stderr.log; sleep 1; done ) &
else
/opt/capella/capella -data ${WORKSPACE_DIR:-/workspace} > /var/log/capella.stdout.log 2> /var/log/capella.stderr.log &
/opt/capella/capella -consoleLog -data ${WORKSPACE_DIR:-/workspace} > /var/log/capella.stdout.log 2> /var/log/capella.stderr.log &
fi
fi
2 changes: 1 addition & 1 deletion docs/docs/git-hooks/git-hooks.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ pre-commit environment and store it in the persistent `/workspace` directory.
If you receive an error message in Eclipse (as shown below) while committing, your pre-commit has failed.
![Empty error message in Eclipse with EGit](./egit-failed-git-hook.png)

Please check the Capella logs, located at `/var/logs`.
Please check the Capella logs, located at `/var/log`.
4 changes: 2 additions & 2 deletions eclipse/autostart
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ then
if [ "$RESTART_ECLIPSE" = "1" ];
then
# Restart Eclipse automatically
( while true; do /opt/eclipse/eclipse -data ${WORKSPACE_DIR:-/workspace} > /var/log/eclipse.stdout.log 2> /var/log/eclipse.stderr.log; sleep 1; done ) &
( while true; do /opt/eclipse/eclipse -consoleLog -data ${WORKSPACE_DIR:-/workspace} > /var/log/eclipse.stdout.log 2> /var/log/eclipse.stderr.log; sleep 1; done ) &
else
/opt/eclipse/eclipse -data ${WORKSPACE_DIR:-/workspace} > /var/log/eclipse.stdout.log 2> /var/log/eclipse.stderr.log &
/opt/eclipse/eclipse -consoleLog -data ${WORKSPACE_DIR:-/workspace} > /var/log/eclipse.stdout.log 2> /var/log/eclipse.stderr.log &
fi
fi
2 changes: 1 addition & 1 deletion jupyter-notebook/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ autorestart=true

[supervisord]
nodaemon=true
childlogdir=/var/log
childlogdir=/var/log/session
4 changes: 2 additions & 2 deletions papyrus/autostart
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ then
if [ "$RESTART_PAPYRUS" = "1" ];
then
# Restart Papyrus automatically
( while true; do /opt/Papyrus/papyrus -data ${WORKSPACE_DIR:-/workspace} > /var/log/papyrus.stdout.log 2> /var/log/papyrus.stderr.log; sleep 1; done ) &
( while true; do /opt/Papyrus/papyrus -consoleLog -data ${WORKSPACE_DIR:-/workspace} > /var/log/papyrus.stdout.log 2> /var/log/papyrus.stderr.log; sleep 1; done ) &
else
/opt/Papyrus/papyrus -data ${WORKSPACE_DIR:-/workspace} > /var/log/papyrus.stdout.log 2> /var/log/papyrus.stderr.log &
/opt/Papyrus/papyrus -consoleLog -data ${WORKSPACE_DIR:-/workspace} > /var/log/papyrus.stdout.log 2> /var/log/papyrus.stderr.log &
fi
fi
2 changes: 0 additions & 2 deletions remote/startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,4 @@ else
cat /tmp/supervisord/supervisord.xrdp.conf >> /etc/supervisord.conf
fi

echo "---START_SESSION---"

exec supervisord
2 changes: 1 addition & 1 deletion remote/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ environment=DISPLAY=":10"

[supervisord]
nodaemon=true
childlogdir=/var/log
childlogdir=/var/log/session

0 comments on commit 9b6a908

Please sign in to comment.