This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 0de9b0f494bf6943e4dde0deccd3cbcf436ce349 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Mar 8 00:58:12 2014 +0100 X2Go::Utils: Provide function is_true() and simplify x2gocleansessions with it --- X2Go/Utils.pm | 13 +++++++++++-- x2goserver/sbin/x2gocleansessions | 20 ++++---------------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/X2Go/Utils.pm b/X2Go/Utils.pm index f1d4858..7f647cc 100644 --- a/X2Go/Utils.pm +++ b/X2Go/Utils.pm @@ -37,8 +37,8 @@ X2Go::Utils Perl package. use strict; use base 'Exporter'; -our @EXPORT = ( 'source_environment', 'clups', 'sanitizer', - 'load_module', +our @EXPORT = ( 'load_module', 'is_true', + 'source_environment', 'clups', 'sanitizer', 'system_capture_merged_output', 'system_capture_stdout_output' ); use Sys::Syslog qw( :standard :macros ); @@ -52,6 +52,15 @@ sub load_module { } +sub is_true { + my $value = shift; + if ( $value =~ m/(1|yes|Yes|YES|on|On|ON|True|true|TRUE)/ ) { + return 1 + } + return 0 +} + + sub source_environment { my $name = shift; diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index eacf4fe..cff334f 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -34,7 +34,7 @@ use X2Go::Log qw( loglevel ); use X2Go::SupeReNicer qw( superenice ); use X2Go::Server::Agent qw( session_is_suspended session_is_running session_has_terminated ); use X2Go::Server::DB qw( dbsys_rmsessionsroot ); -use X2Go::Utils qw( system_capture_stdout_output ); +use X2Go::Utils qw( system_capture_stdout_output is_true ); my $x2go_lib_path = system_capture_stdout_output("x2gopath", "libexec"); openlog($0,'cons,pid','user'); @@ -85,25 +85,13 @@ elsif ($pid == 0 ) # of suspended sessions... my $Config = get_config(); - my $superenice_enable=$Config->param("superenicer.enable"); - my $superenice_forceuser=$Config->param("superenicer.force-user-renice"); + my $superenice_enable = is_true($Config->param("superenicer.enable")); + my $superenice_forceuser = is_true($Config->param("superenicer.force-user-renice")); + my $superenice_normal=$Config->param("superenicer.normal-nice-level"); my $superenice_idle=$Config->param("superenicer.idle-nice-level"); my $superenice_ignoredusers=$Config->param("superenicer.ignored-users"); - if ($superenice_enable =~ m/(1|yes|Yes|YES|on|On|ON|True|true|TRUE)/ ) - { - $superenice_enable=1; - } else { - $superenice_enable=0; - } - if ($superenice_forceuser =~ m/(1|yes|Yes|YES|on|On|ON|True|true|TRUE)/ ) - { - $superenice_forceuser=1; - } else { - $superenice_forceuser=0; - } - # close any open file descriptor left open by our parent before the fork for (glob "/proc/$$/fd/*") { POSIX::close($_) if m{/(\d+)$}; } -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git