[otrs-cvs] otrs/Kernel/System/Log File.pm,1.15,1.16

[CVS commits notifications of OTRS.org]

Comments:
Update of /home/cvs/otrs/Kernel/System/Log
In directory lancelot:/tmp/cvs-serv11732/Log

Modified Files:
	File.pm 
Log Message:
Replaced OTRS GmbH with OTRS AG. Simplify the code for a better readability.

Author: tr

Index: File.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/System/Log/File.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** File.pm	2 Oct 2007 10:38:08 -0000	1.15
--- File.pm	25 Apr 2008 13:15:18 -0000	1.16
***************
*** 1,5 ****
  # --
  # Kernel/System/Log/File.pm - file log backend
! # Copyright (C) 2001-2007 OTRS GmbH, http://otrs.org/
  # --
  # $Id$
--- 1,5 ----
  # --
  # Kernel/System/Log/File.pm - file log backend
! # Copyright (C) 2001-2008 OTRS AG, http://otrs.org/
  # --
  # $Id$
***************
*** 7,11 ****
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl.txt.
  # --
  
--- 7,11 ----
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl-2.0.txt.
  # --
  
***************
*** 42,46 ****
      # Bind stderr to log file, because iis do print stderr to web page.
      if ( $ENV{SERVER_SOFTWARE} && $ENV{SERVER_SOFTWARE} =~ /^microsoft\-iis/i ) {
!         if ( !open( STDERR, ">>", $Self->{LogFile} . ".error" ) ) {
              print STDERR "ERROR: Can't write $Self->{LogFile}.error: $!";
          }
--- 42,46 ----
      # Bind stderr to log file, because iis do print stderr to web page.
      if ( $ENV{SERVER_SOFTWARE} && $ENV{SERVER_SOFTWARE} =~ /^microsoft\-iis/i ) {
!         if ( !open STDERR, '>>', $Self->{LogFile} . ".error" ) {
              print STDERR "ERROR: Can't write $Self->{LogFile}.error: $!";
          }
***************
*** 56,60 ****
  
      # open logfile
!     if ( open( $FH, ">>", $Self->{LogFile} ) ) {
          print $FH "[" . localtime() . "]";
          if ( $Param{Priority} =~ /debug/i ) {
--- 56,60 ----
  
      # open logfile
!     if ( open $FH, '>>', $Self->{LogFile} ) {
          print $FH "[" . localtime() . "]";
          if ( $Param{Priority} =~ /debug/i ) {
***************
*** 84,98 ****
  
          # close file handle
!         close($FH);
          return 1;
      }
-     else {
  
!         # print error screen
!         print STDERR "\n";
!         print STDERR " >> Can't write $Self->{LogFile}: $! <<\n";
!         print STDERR "\n";
!         return;
!     }
  }
  
--- 84,96 ----
  
          # close file handle
!         close $FH;
          return 1;
      }
  
!     # print error screen
!     print STDERR "\n";
!     print STDERR " >> Can't write $Self->{LogFile}: $! <<\n";
!     print STDERR "\n";
!     return;
  }