stackforge-attic/murano-docs
Code Issues Proposed changes

Log functions updated

Browse Source
This commit is contained in:
Dmitry Teselkin 2013-02-27 16:36:51 +04:00
parent 03d67d4084
commit 1c034ff250
2 changed files with 114 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
Deployment/WindowsPowerShell/Modules/CoreFunctions/include/Logger.ps1
View File

@ -24,115 +24,113 @@
[log4net.Config.XmlConfigurator]::Configure($Log4NetConfig) [log4net.Config.XmlConfigurator]::Configure($Log4NetConfig)
$__Logger.info("Logger initialized. Log file: '$LogPath'") $__Logger.info("Logger initialized. Log file: '$LogPath'`n")
} }
Function Write-LogInfo {
param (
[String[]] $Text
)
foreach ($Line in $Text) {
$__Logger.info($Line)
}
}
New-Alias -Name Write-Log -Value Write-LogInfo
Function Out-LogInfo { Function Out-LogInfo {
param ( param (
[Parameter(ValueFromPipeline=$true)] [Parameter(ValueFromPipeline=$true)]
[String] $Text $InputObject,
) [Switch] $EntireObject
$__Logger.info($Text) )
} process {
New-Alias -Name Out-Log -Value Out-LogInfo if ($EntireObject) {
$__Logger.info("`n$(Out-String -InputObject $InputObject)")
}
else {
Function Write-LogWarning { foreach ($Object in $InputObject) {
param ( $__Logger.info((Out-String -InputObject $Object))
[String] $Text }
) }
foreach ($Line in $Text) {
$__Logger.warn($Line)
} }
} }
New-Alias -Name Out-Log -Value Out-LogInfo
New-Alias -Name Write-Log -Value Out-LogInfo
Function Out-LogWarning { Function Out-LogWarning {
param ( param (
[Parameter(ValueFromPipeline=$true)] [Parameter(ValueFromPipeline=$true)]
[String] $Text $InputObject,
) [Switch] $EntireObject
$__Logger__.warn($Text) )
} process {
if ($EntireObject) {
$__Logger.warn("`n$(Out-String -InputObject $InputObject)")
}
Function Write-LogError { else {
param ( foreach ($Object in $InputObject) {
[String] $Text $__Logger.warn((Out-String -InputObject $Object))
) }
foreach ($Line in $Text) { }
$__Logger.error($Line)
} }
} }
New-Alias -Name Write-LogWarning -Value Out-LogWarning
Function Out-LogError { Function Out-LogError {
param ( param (
[Parameter(ValueFromPipeline=$true)] [Parameter(ValueFromPipeline=$true)]
[String] $Text $InputObject,
) [Switch] $EntireObject
$__Logger.error($Text) )
} process {
if ($EntireObject) {
$__Logger.error("`n$(Out-String -InputObject $InputObject)")
}
Function Write-LogFatal { else {
param ( foreach ($Object in $InputObject) {
[String] $Text $__Logger.error((Out-String -InputObject $Object))
) }
foreach ($Line in $Text) { }
$__Logger.fatal($Line)
} }
} }
New-Alias -Name Write-LogError -Value Out-LogError
Function Out-LogFatal { Function Out-LogFatal {
param ( param (
[Parameter(ValueFromPipeline=$true)] [Parameter(ValueFromPipeline=$true)]
[String] $Text $InputObject,
) [Switch] $EntireObject
$__Logger.fatal($Text) )
} process {
if ($EntireObject) {
$__Logger.fatal("`n$(Out-String -InputObject $InputObject)")
}
Function Write-LogDebug { else {
param ( foreach ($Object in $InputObject) {
[String] $Text $__Logger.fatal((Out-String -InputObject $Object))
) }
foreach ($Line in $Text) { }
$__Logger.debug($Line)
} }
} }
New-Alias -Name Write-LogFatal -Value Out-LogFatal
Function Out-LogDebug { Function Out-LogDebug {
param ( param (
[Parameter(ValueFromPipeline=$true)] [Parameter(ValueFromPipeline=$true)]
[String] $Text $InputObject,
) [Switch] $EntireObject
$__Logger.debug($Text) )
process {
if ($EntireObject) {
$__Logger.debug("`n$(Out-String -InputObject $InputObject)")
}
else {
foreach ($Object in $InputObject) {
$__Logger.debug((Out-String -InputObject $Object))
}
}
}
} }
New-Alias -Name Write-LogDebug -Value Out-LogDebug

72
Deployment/WindowsPowerShell/Modules/CoreFunctions/log4net.config
View File

@ -1,42 +1,42 @@
<log4net> <log4net>
<appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender" > <appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender" >
<param name="File" type="log4net.Util.PatternString" value="%property{LogPath}" /> <param name="File" type="log4net.Util.PatternString" value="%property{LogPath}" />
<param name="AppendToFile" value="true" /> <param name="AppendToFile" value="true" />
<param name="RollingStyle" value="Size" /> <param name="RollingStyle" value="Size" />
<param name="MaxSizeRollBackups" value="100" /> <param name="MaxSizeRollBackups" value="100" />
<param name="MaximumFileSize" value="1024KB" /> <param name="MaximumFileSize" value="1024KB" />
<param name="StaticLogFileName" value="true" /> <param name="StaticLogFileName" value="true" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" /> <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="%date [%-5level] [%property{ModuleName}] %message%newline" /> <param name="ConversionPattern" value="%date [%-5level] [%property{ModuleName}] %message" />
</layout> </layout>
</appender> </appender>
<appender name="ColoredConsoleAppender" type="log4net.Appender.ColoredConsoleAppender"> <appender name="ColoredConsoleAppender" type="log4net.Appender.ColoredConsoleAppender">
<mapping> <mapping>
<level value="error" /> <level value="error" />
<foreColor value="Red, HighIntensity" /> <foreColor value="Red, HighIntensity" />
</mapping> </mapping>
<mapping> <mapping>
<level value="warn" /> <level value="warn" />
<foreColor value="Yellow, HighIntensity" /> <foreColor value="Yellow, HighIntensity" />
</mapping> </mapping>
<mapping> <mapping>
<level value="info" /> <level value="info" />
<foreColor value="Green, HighIntensity" /> <foreColor value="Green, HighIntensity" />
</mapping> </mapping>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date [%-5level] [%property{ModuleName}] %message%newline" /> <conversionPattern value="%date [%-5level] [%property{ModuleName}] %message" />
</layout> </layout>
</appender> </appender>
<!--root> <!--root>
<level value="info" /> <level value="info" />
</root--> </root-->
<logger name="PowerShell" additivity="false"> <logger name="PowerShell" additivity="false">
<!--level value="info" /--> <!--level value="info" /-->
<appender-ref ref="ColoredConsoleAppender" /> <appender-ref ref="ColoredConsoleAppender" />
<appender-ref ref="RollingFileAppender" /> <appender-ref ref="RollingFileAppender" />
</logger> </logger>
</log4net> </log4net>