The branch, master has been updated via ca8d497eb86c55b26e5fc1711aa57047217487b8 (commit) from 4734598e08e05ec3754f57976e07d9d7f08c56eb (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 ca8d497eb86c55b26e5fc1711aa57047217487b8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Sep 17 10:58:39 2012 +0200 more fixes for X2GO::* module transistion ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2gosessionlimit | 1 - x2goserver/lib/x2godbwrapper.pm | 3 ++- x2goserver/lib/x2gosqlitewrapper.pl | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit index 5a991c7..d2bd978 100755 --- a/x2goserver/bin/x2gosessionlimit +++ b/x2goserver/bin/x2gosessionlimit @@ -30,7 +30,6 @@ use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(loglevel()) ); - syslog('info', "x2gosessionlimit has been called"); my $maxlimit=-1; diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index f290b71..c3f56dd 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -28,8 +28,9 @@ use Sys::Syslog qw( :standard :macros ); my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2gologlevel; +use X2Go::Log qw(loglevel); +setlogmask( LOG_UPTO(loglevel()) ); my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid()); diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index fdccfc9..94d8f91 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -26,14 +26,6 @@ use POSIX; #### NOTE: this script is run setgid <group> and it cannot do system() calls. -#### -#### One consequence of this is... -#### This first part of code that handles syslogging is duplicated from -#### x2gologlevel.pm. This is because we are not able to detect the -#### installation path automatically via the x2gobasepath in this -#### script. -#### - use Config::Simple; use Sys::Syslog qw( :standard :macros ); use X2Go::Log qw(loglevel); 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).