This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 21836d07adaf521880227d6c58512987efa36727 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Mon Feb 17 14:37:54 2014 +0100 - Fix datetime output format in X2Go/Server/DB/PostgreSQL.pm --- X2Go/Server/DB/PostgreSQL.pm | 24 ++++++++++++------------ debian/changelog | 4 ++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/X2Go/Server/DB/PostgreSQL.pm b/X2Go/Server/DB/PostgreSQL.pm index 880fbac..cc6b529 100644 --- a/X2Go/Server/DB/PostgreSQL.pm +++ b/X2Go/Server/DB/PostgreSQL.pm @@ -137,8 +137,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,'YYYY-MM-DDTHH24:MI:SS'),cookie,client,gr_port, - sound_port,to_char(last_time,'YYYY-MM-DDTHH24:MI:SS'),uname, + to_char(init_time,'YYYY-MM-DD\"T\"HH24:MI:SS'),cookie,client,gr_port, + sound_port,to_char(last_time,'YYYY-MM-DD\"T\"HH24:MI:SS'),uname, to_char(now()-init_time,'SSSS'),fs_port from sessions where server='$server' order by status desc"); $sth->execute()or die; @@ -159,8 +159,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,'YYYY-MM-DDTHH24:MI:SS'),cookie,client,gr_port, - sound_port,to_char(last_time,'YYYY-MM-DDTHH24:MI:SS'),uname, + to_char(init_time,'YYYY-MM-DD\"T\"HH24:MI:SS'),cookie,client,gr_port, + sound_port,to_char(last_time,'YYYY-MM-DD\"T\"HH24:MI:SS'),uname, to_char(now()-init_time,'SSSS'),fs_port from sessions order by status desc"); $sth->execute()or die; @@ -490,8 +490,8 @@ sub db_listsessions my @sessions; 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,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, - sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, + to_char(init_time,'YYYY-MM-DD\"T\"HH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'YYYY-MM-DD\"T\"HH24: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"); @@ -513,8 +513,8 @@ sub db_listsessions_all my @sessions; 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,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, - sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, + to_char(init_time,'YYYY-MM-DD\"T\"HH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'YYYY-MM-DD\"T\"HH24: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"); @@ -537,8 +537,8 @@ sub db_listshadowsessions my @sessions; 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,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, - sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, + to_char(init_time,'YYYY-MM-DD\"T\"HH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'YYYY-MM-DD\"T\"HH24:MI:SS'), uname, to_char(now()- init_time,'SSSS'), fs_port from sessions_view where status !='F' and server='$server' and (session_id like '%XSHAD%') order by status desc"); @@ -560,8 +560,8 @@ sub db_listshadowsessions_all my @sessions; 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,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, - sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, + to_char(init_time,'YYYY-MM-DD\"T\"HH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'YYYY-MM-DD\"T\"HH24:MI:SS'), uname, to_char(now()- init_time,'SSSS'), fs_port from sessions_view where status !='F' and (session_id is like '%XSHAD%') order by status desc"); diff --git a/debian/changelog b/debian/changelog index 7855fbf..04f2dc0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -94,6 +94,10 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low * New upstream version (4.1.0.0): - Use new script x2gopath in Perl::API. (Fixes: #86). + [ Oleksandr Shneyder ] + * New upstream version (4.1.0.0): + - Fix datetime output format in X2Go/Server/DB/PostgreSQL.pm + -- Reinhard Tartler <siretart@tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git