[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-255-gf12dab5

X2go dev team git-admin at x2go.org
Sat Sep 10 02:46:08 CEST 2011


The branch, master has been updated
       via  f12dab5a48c70cd32a54ddb5418948bd28dad2b1 (commit)
      from  f7db69b952f84420aa24b8fb1f7c4b47ebaedf50 (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 f12dab5a48c70cd32a54ddb5418948bd28dad2b1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Sep 10 02:47:17 2011 +0200

    loglevel warn has to be warning

-----------------------------------------------------------------------

Summary of changes:
 x2goserver/bin/x2gomountdirs   |    4 ++--
 x2goserver/etc/x2goserver.conf |    2 +-
 x2goserver/lib/x2gologlevel.pm |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index dfa627c..18d019f 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -298,7 +298,7 @@ for (my $i=0;$i<@dirs;$i++)
 		{
 			$msg = "mounting of @dirs[$i] failed";
 			print "$msg\n";
-			syslog('warn', "WARNING: $msg");
+			syslog('warning', "WARNING: $msg");
 			db_deletemount( $session, $mntpath);
 			rmdir($mntpath);
 		}
@@ -306,7 +306,7 @@ for (my $i=0;$i<@dirs;$i++)
 	else
 	{
 		$msg = "insertion of @dirs[$i] failed (already mounted?), not mounting";
-		syslog('warn', "WARNING: $msg");
+		syslog('warning', "WARNING: $msg");
 		print "$msg\n";
 	}
 }
diff --git a/x2goserver/etc/x2goserver.conf b/x2goserver/etc/x2goserver.conf
index 86f95b6..61312ee 100644
--- a/x2goserver/etc/x2goserver.conf
+++ b/x2goserver/etc/x2goserver.conf
@@ -5,5 +5,5 @@
 #x2gousers=1
 
 [log]
-# possible levels are: emerg, alert, crit, err, warn, notice, info, debug
+# possible levels are: emerg, alert, crit, err, warning, notice, info, debug
 loglevel=notice
diff --git a/x2goserver/lib/x2gologlevel.pm b/x2goserver/lib/x2gologlevel.pm
index 845287d..b6df771 100644
--- a/x2goserver/lib/x2gologlevel.pm
+++ b/x2goserver/lib/x2gologlevel.pm
@@ -40,11 +40,11 @@ sub x2gologlevel {
 	elsif ( $strloglevel eq "alert" )  { $loglevel = LOG_ALERT; }
 	elsif ( $strloglevel eq "crit" )   { $loglevel = LOG_CRIT; }
 	elsif ( $strloglevel eq "err" )    { $loglevel = LOG_ERR; }
-	elsif ( $strloglevel eq "warn" )   { $loglevel = LOG_WARNING; }
+	elsif ( $strloglevel eq "warning" )   { $loglevel = LOG_WARNING; }
 	elsif ( $strloglevel eq "notice" ) { $loglevel = LOG_NOTICE; }
 	elsif ( $strloglevel eq "info" )   { $loglevel = LOG_INFO; }
 	elsif ( $strloglevel eq "debug" )  { $loglevel = LOG_DEBUG; }
 	return $loglevel;
 }
 
-1;
\ No newline at end of file
+1;


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).




More information about the x2go-commits mailing list