x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

x2goserver.git - master (branch) updated: 3.0.99-2-236-ga4838ac
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via a4838ac43b89a0136978c29ddc7468eb42c691f0 (commit) via eaf5a69eb51514fa7abb2ddf0647ae9330d18c67 (commit) from 085bdb5442060de5079a9e6aae6672db880051ee (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 a4838ac43b89a0136978c29ddc7468eb42c691f0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 22:45:42 2011 +0200 Add debug messages to x2gomountdirs script. commit eaf5a69eb51514fa7abb2ddf0647ae9330d18c67 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 22:45:05 2011 +0200 syslogging for x2gocmdexitmessage ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2gocmdexitmessage | 4 ++++ x2goserver/bin/x2gomountdirs | 14 ++++++++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3982892..dba9904 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Fix for x2godbwrapper.pm: we can't open/close the syslog socket in a package. This has to be done by the scripts that use x2godbwrapper.pm. * Add info loglevel messages for x2goserver-extensions scripts. + * Add debug messages to x2gomountdirs script. [ Martin Oehler ] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage index 43dbf0f..8c96e92 100755 --- a/x2goserver/bin/x2gocmdexitmessage +++ b/x2goserver/bin/x2gocmdexitmessage @@ -20,8 +20,12 @@ # Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` X2GO_ROOT=${HOME}/.x2go MESSAGE_FILE=$X2GO_ROOT/C-$1/cmdoutput +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" +$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command output starts with: $(head -n5 $MESSAGE_FILE | sed s/\n/ /g)" + # return command output of the command that was issued by x2goruncommand cat $MESSAGE_FILE diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 3ca2504..1b62543 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -38,6 +38,7 @@ my $session=shift; my $user=shift; my $key=shift; my @dl; +my $msg; my $i=0; @dl[$i]=shift; while(@dl[$i]) @@ -199,12 +200,14 @@ for (my $i=0;$i<@dirs;$i++) @dirs[$i]=~s/__PRINT_SPOOL_//; $printspool=1; $mntpath=$spooldir; + syslog('debug', "mounting $spooldir, mount point type is print spool directory"); } elsif(@dirs[$i]=~m/__MIMEBOX_SPOOL_/) { @dirs[$i]=~s/__MIMEBOX_SPOOL_//; $mimeboxspool=1; $mntpath=$mimeboxdir; + syslog('debug', "mounting $mimeboxdir, mount point type is MIME box directory"); } else { @@ -266,16 +269,19 @@ for (my $i=0;$i<@dirs;$i++) if ($type eq "dir") { $fname="$fname(sshfs-disk)"; + syslog('debug', "@dirs[$i] mounted, mount point type is: client-side folder on harddrive"); } else { if ($fname =~ m/CDROM/) { $fname="$fname(sshfs-cdrom)"; + syslog('debug', "@dirs[$i] mounted, mount point type is: optical disc"); } else { $fname="$fname(sshfs-removable)"; + syslog('debug', "@dirs[$i] mounted, mount point type is: removable device"); } $fname=~s/_ramdrive_mnt_//; } @@ -287,14 +293,18 @@ for (my $i=0;$i<@dirs;$i++) } else { - print "mount @dirs[$i] failed\n"; + $msg = "mounting of @dirs[$i] failed"; + print "$msg\n"; + syslog('warn', "WARNING: $msg"); db_deletemount( $session, $mntpath); rmdir($mntpath); } } else { - print "insertion failed(already mounted?), not mounting\n"; + $msg = "insertion of @dirs[$i] failed (already mounted?), not mounting"; + syslog('warn', "WARNING: $msg"); + print "$msg\n"; } } 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-234-g085bdb5
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via 085bdb5442060de5079a9e6aae6672db880051ee (commit) from dbf158d78a69c3affe60cde8e9c3488fe0ae78e5 (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 085bdb5442060de5079a9e6aae6672db880051ee Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 22:30:44 2011 +0200 Add info loglevel messages for x2goserver-extensions scripts. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver-extensions/bin/x2gosetkeyboard | 4 ++++ x2goserver-extensions/bin/x2goversion | 4 ++++ 3 files changed, 9 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6d3801e..3982892 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Add info loglevel messages for all scripts in bin dir. * Fix for x2godbwrapper.pm: we can't open/close the syslog socket in a package. This has to be done by the scripts that use x2godbwrapper.pm. + * Add info loglevel messages for x2goserver-extensions scripts. [ Martin Oehler ] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/x2goserver-extensions/bin/x2gosetkeyboard b/x2goserver-extensions/bin/x2gosetkeyboard index 6f2fc6f..4073fa9 100755 --- a/x2goserver-extensions/bin/x2gosetkeyboard +++ b/x2goserver-extensions/bin/x2gosetkeyboard @@ -22,6 +22,10 @@ set -e +X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + # set up paths X2GO_SESSION_ROOT=${HOME}/.x2go X2GO_SESSION_DIR=${X2GO_SESSION_ROOT}/C-${X2GO_SESSION} diff --git a/x2goserver-extensions/bin/x2goversion b/x2goserver-extensions/bin/x2goversion index b777625..ecc11d1 100755 --- a/x2goserver-extensions/bin/x2goversion +++ b/x2goserver-extensions/bin/x2goversion @@ -20,6 +20,10 @@ # Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + X2GO_VERSIONS_BASEPATH="$(dirname $0)/../share/x2go/versions" get_version() { 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-233-gdbf158d
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via dbf158d78a69c3affe60cde8e9c3488fe0ae78e5 (commit) from ddcb3950ca7df0790a328acbfbaf9fe462fff83b (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 dbf158d78a69c3affe60cde8e9c3488fe0ae78e5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 22:28:47 2011 +0200 mark log messages with loglevel err with the string ERROR ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2goprint | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2goprint b/x2goserver/bin/x2goprint index b8480ad..edff6eb 100755 --- a/x2goserver/bin/x2goprint +++ b/x2goserver/bin/x2goprint @@ -42,7 +42,7 @@ sub check_root my $realuser=$uname; if ($realuser ne "root") { - syslog('err', "x2goprint was called by user $realuser directly, x2goprint exits now!"); + syslog('err', "ERROR: x2goprint was called by user $realuser directly, x2goprint exits now!"); die "$realuser, you cannot use x2goprint as non-root user..."; } } @@ -57,7 +57,7 @@ sub check_usage } elsif (scalar(@ARGV) != 4) { - syslog('err', "x2goprint was called with a wrong number of cmd line args, x2goprint exits now!"); + syslog('err', "ERROR: x2goprint was called with a wrong number of cmd line args, x2goprint exits now!"); print STDERR "ERROR: Usage:\nx2goprint user session file titleFile\nx2goprint user\n"; exit 1; } @@ -112,7 +112,7 @@ if ( $mounts=~m/$spooldir/) syslog('info', "client-side spool dir is mounted, transferring printable file $pdfFile to X2go client system"); if (not move("$printdir/$pdfFile", "$spooltmp")) { - syslog('err', "x2goprint failed to process print spool job for file $pdfFile"); + syslog('err', "ERROR: x2goprint failed to process print spool job for file $pdfFile"); die "$0: Can't move $printdir/$pdfFile to $spooltmp/"; } chown $uid, $gid, "$spooltmp/$pdfFile"; 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-232-gddcb395
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via ddcb3950ca7df0790a328acbfbaf9fe462fff83b (commit) from b8c1e92197897609a27f7c13ccc2b30bb993a373 (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 ddcb3950ca7df0790a328acbfbaf9fe462fff83b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 18:46:09 2011 +0200 Fix for x2godbwrapper.pm: we can't open/close the syslog socket in a package. This has to be done by the scripts that use x2godbwrapper.pm. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/lib/x2godbwrapper.pm | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7f597df..6d3801e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Add debugging support for almost all DB functions in x2godbwrapper.pm, fix for Syslog module initialization in all Perl scripts. * Add info loglevel messages for all scripts in bin dir. + * Fix for x2godbwrapper.pm: we can't open/close the syslog socket in a + package. This has to be done by the scripts that use x2godbwrapper.pm. [ Martin Oehler ] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index 6ce0cd1..bce67d3 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -30,9 +30,6 @@ my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2gologlevel; -openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); - my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid()); @@ -587,6 +584,3 @@ sub db_listsessions_all return split("\n",`$x2go_lib_path/x2gosqlitewrapper listsessions_all`); } } - -# closing syslog -closelog; \ No newline at end of file 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).

1 0

cups-x2go.git - master (branch) updated: 3.0.0.2-27-g1bf0849
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via 1bf0849263317a9baa1f9001db5dec3c1e93805f (commit) from 247294d3841c7233c1c0159ca3ebbec7d3346f4e (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 1bf0849263317a9baa1f9001db5dec3c1e93805f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 18:44:16 2011 +0200 cosmetic fix ----------------------------------------------------------------------- Summary of changes: cups-x2go.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/cups-x2go.conf b/cups-x2go.conf index ced8a08..74d083d 100644 --- a/cups-x2go.conf +++ b/cups-x2go.conf @@ -17,4 +17,4 @@ #ps2pdf = /usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\" ## loglevel for cups-x2go, possible values: emerg, alert, crit, err, warn, notice, info, debug -# loglevel = notice \ No newline at end of file +#loglevel = notice hooks/post-receive -- cups-x2go.git (CUPS Backend for X2go Printing) 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 "cups-x2go.git" (CUPS Backend for X2go Printing).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-231-gb8c1e92
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via b8c1e92197897609a27f7c13ccc2b30bb993a373 (commit) from 6d4b1f0ea803d86b5f421de4047d334f69e63fe6 (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 b8c1e92197897609a27f7c13ccc2b30bb993a373 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 18:37:10 2011 +0200 properly closing syslog socket ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2golistdesktops | 3 +++ x2goserver/bin/x2golistsessions | 3 +++ x2goserver/bin/x2gomountdirs | 3 +++ x2goserver/bin/x2goprint | 3 +++ x2goserver/bin/x2gosessionlimit | 3 +++ x2goserver/bin/x2goshowblocks | 3 +++ x2goserver/bin/x2goumount-session | 2 ++ x2goserver/lib/x2gochangestatus | 3 +++ x2goserver/lib/x2gocreatesession | 3 +++ x2goserver/lib/x2godbwrapper.pm | 3 +++ x2goserver/lib/x2gogetagent | 5 ++++- x2goserver/lib/x2gogetdisplays | 3 +++ x2goserver/lib/x2gogetports | 3 +++ x2goserver/lib/x2gogetservers | 3 +++ x2goserver/lib/x2goinsertport | 2 ++ x2goserver/lib/x2goinsertsession | 3 +++ x2goserver/lib/x2golistsessions_root | 3 +++ x2goserver/lib/x2golistsessions_sql | 3 +++ x2goserver/lib/x2goresume | 3 +++ x2goserver/lib/x2gosuspend-agent | 5 ++++- 20 files changed, 60 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops index 33e7e05..743d23d 100755 --- a/x2goserver/bin/x2golistdesktops +++ b/x2goserver/bin/x2golistdesktops @@ -86,3 +86,6 @@ for(my $i=0;$i<@outp;$i++) print "@ln[1]\@@ln[2]\n"; } } + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions index 2a99327..a30ce43 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistsessions @@ -88,3 +88,6 @@ for (my $i=0;$i<@outp;$i++) print "@outp[$i]\n"; } } + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 3f94f6c..3ca2504 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -300,3 +300,6 @@ for (my $i=0;$i<@dirs;$i++) unlink($key); unlink("$key.ident"); + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/bin/x2goprint b/x2goserver/bin/x2goprint index 88a4eaf..b8480ad 100755 --- a/x2goserver/bin/x2goprint +++ b/x2goserver/bin/x2goprint @@ -137,3 +137,6 @@ if ( $mounts=~m/$spooldir/) unlink("$printdir/$pdfFile"); } + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit index 9022160..073d0c0 100755 --- a/x2goserver/bin/x2gosessionlimit +++ b/x2goserver/bin/x2gosessionlimit @@ -105,3 +105,6 @@ if ($maxlimit <= $scount) exit 0; } print "$maxlimit\n"; + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks index 2d29a55..d762645 100755 --- a/x2goserver/bin/x2goshowblocks +++ b/x2goserver/bin/x2goshowblocks @@ -42,3 +42,6 @@ for (my $i=0;$i<@outp;$i++) my $path=(split("\\|",@outp[$i]))[1]; print `su $uname -c "lsof 2>/dev/null | grep $path"`; } + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 84b8342..f63ee36 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -137,3 +137,5 @@ break: cont: } +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus index ef0fb7a..5b75400 100755 --- a/x2goserver/lib/x2gochangestatus +++ b/x2goserver/lib/x2gochangestatus @@ -35,3 +35,6 @@ my $status=shift or die; my $sid=shift or die; db_changestatus($status, $sid); + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession index 8bf0852..92a3cdc 100755 --- a/x2goserver/lib/x2gocreatesession +++ b/x2goserver/lib/x2gocreatesession @@ -40,3 +40,6 @@ my $fs_port=shift or die; my $sid=shift or die; db_createsession($cookie,$pid,$client,$gr_port, $snd_port, $fs_port, $sid); + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index 454193b..6ce0cd1 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -587,3 +587,6 @@ sub db_listsessions_all return split("\n",`$x2go_lib_path/x2gosqlitewrapper listsessions_all`); } } + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent index be57906..66b49df 100755 --- a/x2goserver/lib/x2gogetagent +++ b/x2goserver/lib/x2gogetagent @@ -32,4 +32,7 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); my $sid=shift or die; my $agent = db_getagent $sid; -print $agent; \ No newline at end of file +print $agent; + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays index 8bdd705..3ce65b9 100755 --- a/x2goserver/lib/x2gogetdisplays +++ b/x2goserver/lib/x2gogetdisplays @@ -34,3 +34,6 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); my $host=shift or die; my $displays = join("\n", db_getdisplays($host)); print $displays; + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports index 831c80a..6a637a2 100755 --- a/x2goserver/lib/x2gogetports +++ b/x2goserver/lib/x2gogetports @@ -35,3 +35,6 @@ my $host=shift or die; my $ports = join("\n", db_getports($host)); print $ports; + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2gogetservers b/x2goserver/lib/x2gogetservers index 6dd9493..6d501a4 100755 --- a/x2goserver/lib/x2gogetservers +++ b/x2goserver/lib/x2gogetservers @@ -32,3 +32,6 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); my $servers = join("\n", db_getservers); print $servers; + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport index 5ff1c8c..d1994e1 100755 --- a/x2goserver/lib/x2goinsertport +++ b/x2goserver/lib/x2goinsertport @@ -38,3 +38,5 @@ my $port=shift or die; db_insertport($server,$sid,$port); print "inserted"; +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession index e7a5640..553af07 100755 --- a/x2goserver/lib/x2goinsertsession +++ b/x2goserver/lib/x2goinsertsession @@ -37,3 +37,6 @@ my $sid=shift or die; db_insertsession($display, $server, $sid); print "inserted"; + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2golistsessions_root b/x2goserver/lib/x2golistsessions_root index a6f9b64..32fc608 100755 --- a/x2goserver/lib/x2golistsessions_root +++ b/x2goserver/lib/x2golistsessions_root @@ -78,3 +78,6 @@ for (my $i=0;$i<@outp;$i++) print "@outp[$i]\n"; } } + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index 4549d0e..cb9f406 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -53,3 +53,6 @@ for ( $i=0;$i<@array;$i++) } print "@array[$i]\n"; } + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume index 56ec24c..8f038a7 100755 --- a/x2goserver/lib/x2goresume +++ b/x2goserver/lib/x2goresume @@ -35,3 +35,6 @@ my $client=shift or die; my $sid=shift or die; db_resume($client, $sid); + +# closing syslog +closelog; \ No newline at end of file diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent index 4d9f9f9..1873fac 100755 --- a/x2goserver/lib/x2gosuspend-agent +++ b/x2goserver/lib/x2gosuspend-agent @@ -37,4 +37,7 @@ shift; my $capt=shift; my @words=split(" ",$capt); -system("x2gosuspend-session @words[2] > /dev/null"); \ No newline at end of file +system("x2gosuspend-session @words[2] > /dev/null"); + +# closing syslog +closelog; 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-230-g6d4b1f0
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via 6d4b1f0ea803d86b5f421de4047d334f69e63fe6 (commit) via c4aa48e53727bf9da045908431008e7e63e683f9 (commit) via 4c778c0a532a0c5724a0e88428aa041aca16e481 (commit) via fdb1e9006629617de1b83c1871999a4132c75c8b (commit) via e42a541cbeddb30c86ed5b00ab131a9a380d23da (commit) via 4d021c4d43919869c73cc5894ed6d1ca95b75225 (commit) via aaa640c840713db2578c03012e54b1a96fb00c41 (commit) from 49887e82635ea1b030636cb276152fdd8656cef2 (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 6d4b1f0ea803d86b5f421de4047d334f69e63fe6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 18:25:23 2011 +0200 Add info loglevel messages for all scripts in bin dir. commit c4aa48e53727bf9da045908431008e7e63e683f9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 18:11:09 2011 +0200 fix line-too-long in changelog commit 4c778c0a532a0c5724a0e88428aa041aca16e481 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 17:40:41 2011 +0200 Add debugging support for almost all DB functions in x2godbwrapper.pm, fix for Syslog module initialization in all Perl scripts. commit fdb1e9006629617de1b83c1871999a4132c75c8b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 17:16:03 2011 +0200 add package statement for x2gologlevel package commit e42a541cbeddb30c86ed5b00ab131a9a380d23da Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 16:45:18 2011 +0200 dropping duplicate script x2gosessionlimit from lib dir commit 4d021c4d43919869c73cc5894ed6d1ca95b75225 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 16:04:10 2011 +0200 fix for module import commit aaa640c840713db2578c03012e54b1a96fb00c41 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 15:56:50 2011 +0200 comment update that explains different loglevels ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 + x2goserver/bin/x2golistdesktops | 8 ++- x2goserver/bin/x2golistsessions | 7 ++- x2goserver/bin/x2gomountdirs | 4 +- x2goserver/bin/x2goprint | 4 +- x2goserver/bin/x2goresume-session | 2 + x2goserver/bin/x2goruncommand | 7 ++- x2goserver/bin/x2gosessionlimit | 4 +- x2goserver/bin/x2goshowblocks | 4 +- x2goserver/bin/x2gostartagent | 6 +- x2goserver/bin/x2gosuspend-session | 2 + x2goserver/bin/x2goterminate-session | 2 + x2goserver/bin/x2goumount-session | 4 +- x2goserver/etc/x2goserver.conf | 2 +- x2goserver/lib/x2gochangestatus | 2 +- x2goserver/lib/x2gocreatesession | 2 +- x2goserver/lib/x2godbwrapper.pm | 63 +++++++++++++---- x2goserver/lib/x2gogetagent | 6 +- x2goserver/lib/x2gogetdisplays | 5 +- x2goserver/lib/x2gogetports | 6 +- x2goserver/lib/x2gogetservers | 6 +- x2goserver/lib/x2goinsertport | 2 +- x2goserver/lib/x2goinsertsession | 2 +- x2goserver/lib/x2golistsessions_root | 3 +- x2goserver/lib/x2golistsessions_sql | 6 +- x2goserver/lib/x2gologlevel | 1 - x2goserver/lib/x2gologlevel.pm | 2 + x2goserver/lib/x2goresume | 2 +- x2goserver/lib/x2gosessionlimit | 105 ----------------------------- x2goserver/lib/x2gosqlitewrapper.pl | 1 - x2goserver/lib/x2gosuspend-agent | 3 +- x2goserver/lib/{x2goresume => x2gosyslog} | 13 ++-- x2goserver/sbin/x2gocleansessions | 6 +- x2goserver/sbin/x2godbadmin | 2 +- x2goserver/sbin/x2golistsessions_root | 2 +- 35 files changed, 136 insertions(+), 163 deletions(-) delete mode 100755 x2goserver/lib/x2gosessionlimit copy x2goserver/lib/{x2goresume => x2gosyslog} (86%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4df4777..7f597df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,9 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Change x2gologlevel script into a Perl module (and a script that calls it). Using x2gologlevel function in x2goprint to set loglevel mask. * Initialize Syslog module for all Perl scripts in x2goserver package. + * Add debugging support for almost all DB functions in x2godbwrapper.pm, fix + for Syslog module initialization in all Perl scripts. + * Add info loglevel messages for all scripts in bin dir. [ Martin Oehler ] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops index 5642271..33e7e05 100755 --- a/x2goserver/bin/x2golistdesktops +++ b/x2goserver/bin/x2golistdesktops @@ -22,7 +22,7 @@ use strict; use Sys::Hostname; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2gologlevel; @@ -31,6 +31,12 @@ openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); +if ( @ARGV ) { + syslog('info', "x2golistdesktops has been called with options: @ARGV"); +} else { + syslog('info', "x2golistdesktops has been called without options"); +} + my $serv=shift; if( ! $serv) { diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions index 56a943f..2a99327 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistsessions @@ -22,7 +22,7 @@ use strict; use Sys::Hostname; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; @@ -31,6 +31,11 @@ use x2gologlevel; openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); +if ( @ARGV ) { + syslog('info', "x2golistsessions has been called with options: @ARGV"); +} else { + syslog('info', "x2golistsessions has been called with no option"); +} sub check_stat { diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 5364664..3f94f6c 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -21,7 +21,7 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; @@ -31,6 +31,8 @@ openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); +syslog('info', "x2golistmountdirs has been called with options: @ARGV"); + my $type=shift; my $session=shift; my $user=shift; diff --git a/x2goserver/bin/x2goprint b/x2goserver/bin/x2goprint index c75b49f..88a4eaf 100755 --- a/x2goserver/bin/x2goprint +++ b/x2goserver/bin/x2goprint @@ -24,7 +24,7 @@ use strict; use File::Basename; use File::Copy; use File::Path; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; @@ -34,6 +34,8 @@ openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); +syslog('info', "x2goprint has been called with options: @ARGV"); + sub check_root { my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($<); diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 04b0e23..c41b314 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -35,6 +35,8 @@ X2GO_ROOT=${HOME}/.x2go X2GO_RESIZE=0 X2GO_FULLSCREEN=0 +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + if [ "$X2GO_GEOMETRY" == "" ] then X2GO_GEOMETRY=fullscreen diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 50dcff7..6b038d9 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -26,6 +26,11 @@ X2GO_SESSION=$3 cmd=$5 sndsys=$6 X2GO_SESS_TYPE=$7 + +X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + export DISPLAY export X2GO_AGENT_PID export X2GO_SESSION @@ -35,8 +40,6 @@ X2GO_ROOT=${HOME}/.x2go MESSAGE_FILE=$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput echo "exec $cmd" >> $MESSAGE_FILE -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` - IMEXIT="false" if [ "$sndsys" == "esd" ]; then diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit index f2fc78c..9022160 100755 --- a/x2goserver/bin/x2gosessionlimit +++ b/x2goserver/bin/x2gosessionlimit @@ -22,7 +22,7 @@ use strict; use Config::Simple; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2gologlevel; @@ -31,6 +31,8 @@ openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); +syslog('info', "x2gosessionlimit has been called"); + my $maxlimit=0; my $Config = new Config::Simple(syntax=>'ini'); $Config->read('/etc/x2go/x2goserver.conf' ); diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks index 4b898b2..2d29a55 100755 --- a/x2goserver/bin/x2goshowblocks +++ b/x2goserver/bin/x2goshowblocks @@ -21,7 +21,7 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; @@ -31,6 +31,8 @@ openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); +syslog('info', "x2goshowblocks has been called with options: @ARGV"); + my $uname=shift; my $id=shift; my $tbl="mounts"; diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 91d3e09..544a382 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -20,6 +20,10 @@ # Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + X2GO_PORT=49 #First port for X2GO=50 SSH_PORT=30000 #First ssh port 30001 @@ -38,8 +42,6 @@ X2GO_CMD=$9 X2GO_RESIZE=0 X2GO_FULLSCREEN=0 -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` - if [ "$X2GO_STYPE" == "S" ]; then SHADOW_MODE=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[1]}'` diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index c9b6656..490a276 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -28,6 +28,8 @@ fi X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent $SESSION_NAME` X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index cbe4c38..eac5a4f 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -28,6 +28,8 @@ fi X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent $SESSION_NAME` X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 90c4f58..84b8342 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -22,7 +22,7 @@ use strict; use Sys::Hostname; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; @@ -32,6 +32,8 @@ openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); +syslog('info', "x2goumount-session has been called with options: @ARGV"); + my $session=shift; my $only_path=shift; my $uname=$ENV{'USER'}; diff --git a/x2goserver/etc/x2goserver.conf b/x2goserver/etc/x2goserver.conf index 3a91293..86f95b6 100644 --- a/x2goserver/etc/x2goserver.conf +++ b/x2goserver/etc/x2goserver.conf @@ -5,5 +5,5 @@ #x2gousers=1 [log] -# possible levels are: err, warn, notice, info, debug +# possible levels are: emerg, alert, crit, err, warn, notice, info, debug loglevel=notice diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus index 216740b..ef0fb7a 100755 --- a/x2goserver/lib/x2gochangestatus +++ b/x2goserver/lib/x2gochangestatus @@ -21,7 +21,7 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession index e43024e..8bf0852 100755 --- a/x2goserver/lib/x2gocreatesession +++ b/x2goserver/lib/x2gocreatesession @@ -21,7 +21,7 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index da3c121..454193b 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -23,10 +23,16 @@ package x2godbwrapper; use strict; use Config::Simple; use DBI; - use POSIX; +use Sys::Syslog qw( :standard :macros ); my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; +use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use x2gologlevel; + +openlog($0,'cons,pid','user'); +setlogmask( LOG_UPTO(x2gologlevel()) ); + my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid()); @@ -165,6 +171,7 @@ sub dbsys_listsessionsroot_all sub dbsys_getmounts { + my $mounts; my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { @@ -180,16 +187,20 @@ sub dbsys_getmounts } $sth->finish(); $dbh->disconnect(); - return @strings; + $mounts = @strings; } if ($backend eq 'sqlite') { - return split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`); + $mounts = split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`); } + my $log_retval = join(" ", $mounts); + syslog('debug', "dbsys_getmounts called, session ID: $sid; return value: $log_retval"); + return $mounts } sub db_getmounts { + my $mounts; my $sid=shift or die "argument \"session_id\" missed"; if($backend eq 'postgres') { @@ -205,12 +216,15 @@ sub db_getmounts } $sth->finish(); $dbh->disconnect(); - return @strings; + $mounts = @strings; } if ($backend eq 'sqlite') { - return split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`); + $mounts = split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`); } + my $log_retval = join(" ", $mounts); + syslog('debug', "db_getmounts called, session ID: $sid; return value: $log_retval"); + return $mounts } sub db_deletemount @@ -229,6 +243,7 @@ sub db_deletemount { `$x2go_lib_path/x2gosqlitewrapper deletemount $sid \"$path\"`; } + syslog('debug', "db_deletemount called, session ID: $sid, path: $path"); } sub db_insertmount @@ -256,6 +271,7 @@ sub db_insertmount $res_ok=1; } } + syslog('debug', "db_insertmount called, session ID: $sid, path: $path, client: $client; return value: $res_ok"); return $res_ok; } @@ -280,6 +296,7 @@ sub db_insertsession die "$err: $x2go_lib_path/x2gosqlitewrapper insertsession $display $server $sid"; } } + syslog('debug', "db_insertsession called, session ID: $sid, server: $server, session ID: $sid"); } sub db_createsession @@ -309,6 +326,7 @@ sub db_createsession die $err; } } + syslog('debug', "db_createsession called, session ID: $sid, cookie: $cookie, client: $client, pid: $pid, graphics port: $gr_port, sound port: $snd_port, file sharing port: $fs_port"); } sub db_insertport @@ -328,6 +346,7 @@ sub db_insertport { `$x2go_lib_path/x2gosqlitewrapper insertport $server $sid $sshport`; } + syslog('debug', "db_insertport called, session ID: $sid, server: $server, SSH port: $sshport"); } sub db_resume @@ -346,6 +365,7 @@ sub db_resume { `$x2go_lib_path/x2gosqlitewrapper resume $client $sid`; } + syslog('debug', "db_resume called, session ID: $sid, client: $client"); } sub db_changestatus @@ -364,10 +384,12 @@ sub db_changestatus { `$x2go_lib_path/x2gosqlitewrapper changestatus $status $sid`; } + syslog('debug', "db_changestatus called, session ID: $sid, new status: $status"); } sub db_getdisplays { + my $displays; #ignore $server my $server=shift or die "argument \"server\" missed"; if ($backend eq 'postgres') @@ -384,16 +406,20 @@ sub db_getdisplays } $sth->finish(); $dbh->disconnect(); - return @strings; + $displays = @strings; } if ($backend eq 'sqlite') { - return split("\n",`$x2go_lib_path/x2gosqlitewrapper getdisplays $server`); + $displays = split("\n",`$x2go_lib_path/x2gosqlitewrapper getdisplays $server`); } + my $log_retval = join(" ", $displays); + syslog('debug', "db_getdisplays called, server: $server; return value: $log_retval"); + return $displays; } sub db_getports { + my $ports; #ignore $server my $server=shift or die "argument \"server\" missed"; if ($backend eq 'postgres') @@ -410,16 +436,20 @@ sub db_getports } $sth->finish(); $dbh->disconnect(); - return @strings; + $ports = @strings; } if ($backend eq 'sqlite') { - return split("\n",`$x2go_lib_path/x2gosqlitewrapper getports $server`); + $ports = split("\n",`$x2go_lib_path/x2gosqlitewrapper getports $server`); } + my $log_retval = join(" ", $ports); + syslog('debug', "db_getports called, server: $server; return value: $log_retval"); + return $ports; } sub db_getservers { + my $servers; if ($backend eq 'postgres') { my @strings; @@ -434,18 +464,21 @@ sub db_getservers } $sth->finish(); $dbh->disconnect(); - return @strings; + $servers = @strings; } - if ($backend eq 'sqlite') + if ($backend eq 'sqlite') { - return split("\n",`$x2go_lib_path/x2gosqlitewrapper getservers`); + $servers = split("\n",`$x2go_lib_path/x2gosqlitewrapper getservers`); } + my $log_retval = join(" ", $servers); + syslog('debug', "db_getservers called, return value: $log_retval"); + return $servers; } sub db_getagent { - my $sid=shift or die "argument \"session_id\" missed"; my $agent; + my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; @@ -465,13 +498,14 @@ sub db_getagent { $agent=`$x2go_lib_path/x2gosqlitewrapper getagent $sid`; } + syslog('debug', "db_getagent called, session ID: $sid; return value: $agent"); return $agent; } sub db_getdisplay { - my $sid=shift or die "argument \"session_id\" missed"; my $display; + my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; @@ -491,6 +525,7 @@ sub db_getdisplay { $display=`$x2go_lib_path/x2gosqlitewrapper getdisplay $sid`; } + syslog('debug', "db_getdisplay called, session ID: $sid; return value: $display"); return $display; } diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent index 635a731..be57906 100755 --- a/x2goserver/lib/x2gogetagent +++ b/x2goserver/lib/x2gogetagent @@ -21,7 +21,7 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; @@ -30,6 +30,6 @@ use x2gologlevel; openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); - my $sid=shift or die; -print db_getagent $sid; +my $agent = db_getagent $sid; +print $agent; \ No newline at end of file diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays index e6858d4..8bdd705 100755 --- a/x2goserver/lib/x2gogetdisplays +++ b/x2goserver/lib/x2gogetdisplays @@ -21,7 +21,7 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; @@ -32,4 +32,5 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); my $host=shift or die; -print join("\n", db_getdisplays($host)); +my $displays = join("\n", db_getdisplays($host)); +print $displays; diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports index aee7151..831c80a 100755 --- a/x2goserver/lib/x2gogetports +++ b/x2goserver/lib/x2gogetports @@ -21,7 +21,7 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; @@ -32,4 +32,6 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); my $host=shift or die; -print join("\n", db_getports($host)); + +my $ports = join("\n", db_getports($host)); +print $ports; diff --git a/x2goserver/lib/x2gogetservers b/x2goserver/lib/x2gogetservers index a776dff..6dd9493 100755 --- a/x2goserver/lib/x2gogetservers +++ b/x2goserver/lib/x2gogetservers @@ -21,7 +21,7 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; @@ -30,5 +30,5 @@ use x2gologlevel; openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); - -print join("\n", db_getservers); +my $servers = join("\n", db_getservers); +print $servers; diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport index ae5fc5b..5ff1c8c 100755 --- a/x2goserver/lib/x2goinsertport +++ b/x2goserver/lib/x2goinsertport @@ -21,7 +21,7 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession index b4fdbfa..e7a5640 100755 --- a/x2goserver/lib/x2goinsertsession +++ b/x2goserver/lib/x2goinsertsession @@ -21,7 +21,7 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; diff --git a/x2goserver/lib/x2golistsessions_root b/x2goserver/lib/x2golistsessions_root index af64328..a6f9b64 100755 --- a/x2goserver/lib/x2golistsessions_root +++ b/x2goserver/lib/x2golistsessions_root @@ -22,7 +22,7 @@ use strict; use Sys::Hostname; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2gologlevel; @@ -74,6 +74,7 @@ for (my $i=0;$i<@outp;$i++) @outp[$i] =~ s/\|R\|/\|S\|/; } } + syslog('debug', "x2golistsessions_root has been called..."); print "@outp[$i]\n"; } } diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index 86a9c94..4549d0e 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -21,7 +21,7 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; @@ -47,7 +47,9 @@ for ( $i=0;$i<@array;$i++) my @ln=split('\|',@array[$i]); if (@ln[4] eq "F") { - dbsys_rmsessionsroot( @ln[1]); + my $sid = @ln[1] + dbsys_rmsessionsroot($sid); + syslog('debug', "Purging finished session from X2go db, session ID: $sid"); } print "@array[$i]\n"; } diff --git a/x2goserver/lib/x2gologlevel b/x2goserver/lib/x2gologlevel index 970ea15..945f84e 100755 --- a/x2goserver/lib/x2gologlevel +++ b/x2goserver/lib/x2gologlevel @@ -21,7 +21,6 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use Config::Simple; use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2gologlevel; diff --git a/x2goserver/lib/x2gologlevel.pm b/x2goserver/lib/x2gologlevel.pm index 3d904e2..845287d 100644 --- a/x2goserver/lib/x2gologlevel.pm +++ b/x2goserver/lib/x2gologlevel.pm @@ -20,6 +20,8 @@ # Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +package x2gologlevel; + use strict; use Config::Simple; use Sys::Syslog qw( :standard :macros ); diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume index 80010e1..56ec24c 100755 --- a/x2goserver/lib/x2goresume +++ b/x2goserver/lib/x2goresume @@ -21,7 +21,7 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; diff --git a/x2goserver/lib/x2gosessionlimit b/x2goserver/lib/x2gosessionlimit deleted file mode 100755 index f2fc78c..0000000 --- a/x2goserver/lib/x2gosessionlimit +++ /dev/null @@ -1,105 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> - -use strict; -use Config::Simple; -use Sys::Syslog qw( :DEFAULT ); - -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2gologlevel; - -openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(x2gologlevel()) ); - - -my $maxlimit=0; -my $Config = new Config::Simple(syntax=>'ini'); -$Config->read('/etc/x2go/x2goserver.conf' ); - -sub getGroupLimit -{ - my $group=shift; - my $strlimit=$Config->param("limit groups.$group"); - if ($strlimit ne "") - { - if ($strlimit == 0) - { - print "0\n"; - exit 0; - } - if ($strlimit > $maxlimit) - { - $maxlimit=$strlimit; - } - } -} - -my $uname; -$uname=getpwuid($<); - -my $runningsessions=`x2golistsessions --all-servers`; -my @sessions=split("\n",$runningsessions); -my $scount=@sessions; - -my $strlimit=$Config->param("limit users.$uname"); - -if($strlimit ne "") -{ - if ($strlimit == 0) - { - print "0\n"; - exit 0; - } - if ($strlimit <= $scount) - { - print "$strlimit\n"; - exit 0; - } - print "$strlimit\n"; - exit 0; -} - - -my ($name, $pass, $uid, $pgid, $quota, $comment, $gcos, $dir, $shell, $expire) = getpwnam($uname); - -while (my ($name, $passwd, $gid, $members) = getgrent()) -{ - if ( $pgid eq $gid) - { - getGroupLimit $name; - } - my @memebers=split(" ",$members); - foreach my $member (@memebers) - { - if ($uname eq $member ) - { - getGroupLimit $name; - } - } -} - -if ($maxlimit <= $scount) -{ - print "$maxlimit\n"; - exit 0; -} -print "$maxlimit\n"; diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 0beef3a..641cb9c 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -21,7 +21,6 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; - use DBI; use POSIX; diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent index 928cec4..4d9f9f9 100755 --- a/x2goserver/lib/x2gosuspend-agent +++ b/x2goserver/lib/x2gosuspend-agent @@ -20,7 +20,8 @@ # Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -use Sys::Syslog qw( :DEFAULT ); +strict; +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2gologlevel; diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2gosyslog similarity index 86% copy from x2goserver/lib/x2goresume copy to x2goserver/lib/x2gosyslog index 80010e1..a4d70d0 100755 --- a/x2goserver/lib/x2goresume +++ b/x2goserver/lib/x2gosyslog @@ -21,17 +21,18 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; use x2gologlevel; -openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); +my $component = shift; +my $loglevel = shift; +my $msg = "@ARGV"; -my $client=shift or die; -my $sid=shift or die; +openlog($component,'cons','user'); +syslog($loglevel, $msg); +closelog; -db_resume($client, $sid); diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index f8675ca..af5afee 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -20,12 +20,12 @@ # Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -use Sys::Hostname; -use Sys::Syslog qw( :DEFAULT ); use strict; +use Sys::Hostname; +use Sys::Syslog qw( :standard :macros ); my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; -use lib $x2go_lib_path; +use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2gologlevel; openlog($0,'cons,pid','user'); diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index a789afd..441b176 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -21,7 +21,7 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use Getopt::Long; use Config::Simple; use DBI; diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root index 24bb5d4..6f4a510 100755 --- a/x2goserver/sbin/x2golistsessions_root +++ b/x2goserver/sbin/x2golistsessions_root @@ -21,7 +21,7 @@ use strict; use Sys::Hostname; -use Sys::Syslog qw( :DEFAULT ); +use Sys::Syslog qw( :standard :macros ); use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2gologlevel; 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).

1 0

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.4-24-g73cf843
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, release/0.1.1.x has been updated via 73cf843144b4363d265b946567e7a4484e335558 (commit) from aaea664fff61becb7e1666e2fa16d3db71200447 (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 73cf843144b4363d265b946567e7a4484e335558 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 16:17:59 2011 +0200 Make X2goTerminalSessionSTDOUT.has_command resistable against empty command strings. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/terminal/_stdout.py | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b1630d8..e8f0286 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ python-x2go (0.1.1.5-0~x2go1) UNRELEASED; urgency=low - Fix for X2goSession.has_terminated method. - Fix for executing commands with arguments that contain a slash (thanks to Dick Kniep for digging this out). + - Make X2goTerminalSessionSTDOUT.has_command resistable against empty command + strings. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 19 Jul 2011 20:44:30 +0200 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 28fe55e..331119b 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -693,6 +693,8 @@ class X2goTerminalSessionSTDOUT(object): Verify if the command <cmd> exists on the X2go server. """ + test_cmd = None; + cmd = cmd.strip('"').strip('"') if cmd.find('RDP') != -1: cmd = 'rdesktop' hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-26-g0389489
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via 0389489a4e5d4479ddfa48979d41749bef80245a (commit) from 1b32dfdcb3ef10f5ccb56ee6481e28b0b6519ef8 (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 0389489a4e5d4479ddfa48979d41749bef80245a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 16:17:59 2011 +0200 Make X2goTerminalSessionSTDOUT.has_command resistable against empty command strings. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/terminal/_stdout.py | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 69fc69a..6bb444a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ python-x2go (0.1.1.5-0~x2go1) unstable; urgency=low - Fix for X2goSession.has_terminated method. - Fix for executing commands with arguments that contain a slash (thanks to Dick Kniep for digging this out). + - Make X2goTerminalSessionSTDOUT.has_command resistable against empty command + strings. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 19 Jul 2011 20:44:30 +0200 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index f27bd13..04b58a3 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -693,6 +693,8 @@ class X2goTerminalSessionSTDOUT(object): Verify if the command <cmd> exists on the X2go server. """ + test_cmd = None; + cmd = cmd.strip('"').strip('"') if cmd.find('RDP') != -1: cmd = 'rdesktop' hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

cups-x2go.git - master (branch) updated: 3.0.0.2-26-g247294d
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via 247294d3841c7233c1c0159ca3ebbec7d3346f4e (commit) from d94e29dcd1b5cf40aad6505b7a2d004b828b5554 (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 247294d3841c7233c1c0159ca3ebbec7d3346f4e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 15:57:53 2011 +0200 comment update of those that explain different loglevels ----------------------------------------------------------------------- Summary of changes: cups-x2go | 2 +- cups-x2go.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index 061dcb4..9943926 100755 --- a/cups-x2go +++ b/cups-x2go @@ -41,7 +41,7 @@ my $printdsa = "/root/.ssh/id_dsa-x2goprint"; my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\""; #my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f /usr/bin/margin-offset.ps \"%s\""; -## loglevel for cups-x2go, possible values: err, warn, notice, info, debug +## loglevel for cups-x2go, possible values: emerg, alert, crit, err, warn, notice, info, debug my $strloglevel = "notice"; # override hardcoded settings via config file diff --git a/cups-x2go.conf b/cups-x2go.conf index 6c7bf28..ced8a08 100644 --- a/cups-x2go.conf +++ b/cups-x2go.conf @@ -16,5 +16,5 @@ ## command to generate PDF file #ps2pdf = /usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\" -## loglevel for cups-x2go, possible values: err, warn, notice, info, debug +## loglevel for cups-x2go, possible values: emerg, alert, crit, err, warn, notice, info, debug # loglevel = notice \ No newline at end of file hooks/post-receive -- cups-x2go.git (CUPS Backend for X2go Printing) 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 "cups-x2go.git" (CUPS Backend for X2go Printing).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits