[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.0.1-28-g2747cda
X2Go dev team
git-admin at x2go.org
Fri Jan 3 20:53:01 CET 2014
The branch, build-baikal has been updated
via 2747cda3acda1531fccbd52092e08837866d60ab (commit)
from 83df64accdfbae7225d3894b49b6c0cde3124847 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
x2goserver/lib/x2gosqlitewrapper.pl | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0a72d8c..e5c3971 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ x2goserver (3.1.1.0-0~x2go1) UNRELEASED; urgency=low
- Add/enable debugging of x2gocleansessions.
- Silence error messages if the agent's session.log file is not accessible
(e.g. on NFSv4+Krb5-mounted homes).
+ - Improve concurrent database access with session db backend SQLite.
* Remove /etc/x2go/applications on package removal if it is a
symlink, keep it, if it is a directory. Remove /etc/x2go
(if empty after purge) on package purge.
diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl
index 1d8923a..bb0e621 100755
--- a/x2goserver/lib/x2gosqlitewrapper.pl
+++ b/x2goserver/lib/x2gosqlitewrapper.pl
@@ -63,7 +63,8 @@ my $dbfile="$homedir/x2go_sessions";
my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($<);
my $realuser=$uname;
-my $dbh=DBI->connect("dbi:SQLite:dbname=$dbfile","","",{AutoCommit => 1}) or die $_;
+my $dbh=DBI->connect("dbi:SQLite:dbname=$dbfile","","",{sqlite_use_immediate_transaction => 1, AutoCommit => 1, }) or die $_;
+$dbh->sqlite_busy_timeout( 2000 );
my $cmd=shift or die "command not specified";
my $rc=0;
hooks/post-receive
--
x2goserver.git (X2Go Server)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).
More information about the x2go-commits
mailing list