mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-01-28 08:01:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed problem with environment variable parsing and detainting.

Browse Source 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3461 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan
2011-06-23 21:12:47 +00:00
parent 241cb5f84a
commit 8082f491db
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
View File

@@ -246,12 +246,12 @@ sub initialise( @ )
}
my $level;
$tempLevel = $level if ( $level = $this->getTargettedEnv('LOG_LEVEL') );
$tempLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL')) );
$tempTermLevel = $level if ( $level = $this->getTargettedEnv('LOG_LEVEL_TERM') );
$tempDatabaseLevel = $level if ( $level = $this->getTargettedEnv('LOG_LEVEL_DATABASE') );
$tempFileLevel = $level if ( $level = $this->getTargettedEnv('LOG_LEVEL_FILE') );
$tempSyslogLevel = $level if ( $level = $this->getTargettedEnv('LOG_LEVEL_SYSLOG') );
$tempTermLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_TERM')) );
$tempDatabaseLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_DATABASE')) );
$tempFileLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_FILE')) );
$tempSyslogLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_SYSLOG')) );
if ( ZM_LOG_DEBUG )
{
@@ -336,7 +336,8 @@ sub getTargettedEnv( $ )
my $this = shift;
my $name = shift;
my $envName = $name."_".$this->{id};
my $value = $ENV{$envName} if ( defined($ENV{$envName}) );
my $value;
$value = $ENV{$envName} if ( defined($ENV{$envName}) );
if ( !defined($value) && $this->{id} ne $this->{idRoot} )
{
$envName = $name."_".$this->{idRoot};
@@ -346,6 +347,10 @@ sub getTargettedEnv( $ )
{
$value = $ENV{$name} if ( defined($ENV{$name}) );
}
if ( defined($value) )
{
( $value ) = $value =~ m/(.*)/;
}
return( $value );
}