[X2Go-Commits] [x2goserver] 05/05: x2goserver-xsession/etc/Xsession: rotate old log/error file before appending new data. Fixes: #923.
git-admin at x2go.org
git-admin at x2go.org
Sat Aug 13 03:45:19 CEST 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.
commit 65e9b8c308aad422c3e84760b63789ce58efedae
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat Aug 13 03:26:26 2016 +0200
x2goserver-xsession/etc/Xsession: rotate old log/error file before appending new data. Fixes: #923.
---
debian/changelog | 2 ++
x2goserver-xsession/etc/Xsession | 10 ++++++++++
2 files changed, 12 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 5af3e93..f125f8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -90,6 +90,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
creating session log/error file and add uname call where necessary.
- x2goserver-xsession/etc/Xsession: include hostname in
xsession-x2go-errors file name. Part of #923.
+ - x2goserver-xsession/etc/Xsession: rotate old log/error file before
+ appending new data. Fixes: #923.
* x2goserver.spec:
- Add sudo and logcheck as BuildRequires and Requires. Don't own
directories that are owned by sudo and logcheck. Logcheck is not
diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
index 81264a0..2bf3e33 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
@@ -77,6 +77,16 @@ USERXSESSIONRC=$HOME/.xsessionrc-x2go
ALTUSERXSESSION=$HOME/.Xsession-x2go
ERRFILE="${HOME}/.xsession-x2go-${cur_hostname}-errors"
+# Move the old error log file away.
+if [ -f "${ERRFILE}" ]; then
+ if [ -L "${ERRFILE}" ]; then
+ resolved_errfile="$(perl -e 'use Cwd qw (abs_path); print abs_path ("' "${ERRFILE}" '") . "\n";')"
+ mv "${resolved_errfile}" "${resolved_errfile}.old" || errormsg "Unable to move symlinked old log/error file '${resolved_errfile}'; aborting."
+ else
+ mv "${ERRFILE}" "${ERRFILE}.old" || errormsg "Unable to move old log/error file '${ERRFILE}'; aborting."
+ fi
+fi
+
# attempt to create an error file; abort if we cannot
if (umask 177 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] && [ ! -L "$ERRFILE" ]; then
chmod 600 "$ERRFILE"
--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list