The branch, master has been updated via c10acfd3aedaa8ca2b5a31eb8e4bdeed427442b4 (commit) from 7a1fb5126e83f8ba2a4e140f8a8c84ff6122f2cf (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 ----------------------------------------------------------------- commit c10acfd3aedaa8ca2b5a31eb8e4bdeed427442b4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Sep 14 18:34:32 2011 +0200 Present an ISO-8601 compliant datetime string in session lists rendered by x2golistsessions (and similar) command(s). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/lib/x2godbwrapper.pm | 16 ++++++++-------- x2goserver/lib/x2gosqlitewrapper.pl | 16 ++++++++-------- 3 files changed, 18 insertions(+), 16 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fda1a9a..58cfe0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -59,6 +59,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Add real error message if client fails to resume/suspend/terminate a session. * SQLite DB backend: Fix typo in date format template. + * Present an ISO-8601 compliant datetime string in session lists + rendered by x2golistsessions (and similar) command(s). [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index cf514e4..10a1b1e 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -117,8 +117,8 @@ sub dbsys_listsessionsroot "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port, - sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname, + to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'),cookie,client,gr_port, + sound_port,to_char(last_time,'YYYY-MM-DDTHH24:MI:SS'),uname, to_char(now()-init_time,'SSSS'),fs_port from sessions where server='$server' order by status desc"); $sth->execute()or die; @@ -145,8 +145,8 @@ sub dbsys_listsessionsroot_all my @strings; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port, - sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname, + to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'),cookie,client,gr_port, + sound_port,to_char(last_time,'YYYY-MM-DDTHH24:MI:SS'),uname, to_char(now()-init_time,'SSSS'),fs_port from sessions order by status desc"); $sth->execute()or die; @@ -534,8 +534,8 @@ sub db_listsessions my @strings; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'DD.MM.YY*HH24:MI:SS'), cookie, client, gr_port, - sound_port, to_char( last_time, 'DD.MM.YY*HH24:MI:SS'), uname, + to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, to_char(now()- init_time,'SSSS'), fs_port from sessions_view where status !='F' and server='$server' and (session_id not like '%XSHAD%') order by status desc"); @@ -563,8 +563,8 @@ sub db_listsessions_all my @strings; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'DD.MM.YY*HH24:MI:SS'), cookie, client, gr_port, - sound_port, to_char( last_time, 'DD.MM.YY*HH24:MI:SS'), uname, + to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, to_char(now()- init_time,'SSSS'), fs_port from sessions_view where status !='F' and (session_id not like '%XSHAD%') order by status desc"); diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 551cab1..c7ba72b 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -52,9 +52,9 @@ elsif($cmd eq "listsessionsroot") my $server=shift or die "argument \"server\" missed"; my @strings; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',init_time), cookie,client,gr_port,sound_port, - substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',last_time), uname, strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions where server=? order by status desc"); @@ -67,9 +67,9 @@ elsif($cmd eq "listsessionsroot_all") checkroot(); my @strings; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',init_time), cookie,client,gr_port,sound_port, - substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',last_time), uname, strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions order by status desc"); @@ -265,9 +265,9 @@ elsif($cmd eq "listsessions") my $server=shift or die "argument \"server\" missed"; my @strings; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',init_time), cookie,client,gr_port,sound_port, - substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',last_time), uname, strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions where status !='F' and server=? and uname=? @@ -280,9 +280,9 @@ elsif($cmd eq "listsessions_all") { my @strings; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*.%H:%M:%S',init_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',init_time), cookie,client,gr_port,sound_port, - substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*.%H:%M:%S',last_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',last_time), uname, strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions where status !='F' and uname=? and ( session_id not like '%XSHAD%') order by status desc"); 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).