Skip to content

Commit 76b1677

Browse files
steveshorttsteveshortt
committed
added Log4netHelpers
1 parent ccb3d08 commit 76b1677

5 files changed

Lines changed: 55 additions & 30 deletions

File tree

‎Synapse.Common/Classes/Logging/FileAppender.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ public static void RemoveAppender(string loggerName, IAppender appender)
7272
}
7373
}
7474

75-
public interface IDynamicAppender : IDisposable
76-
{
77-
ILog Log { get; }
78-
}
75+
public interface IDynamicAppender : IDisposable
76+
{
77+
ILog Log { get; }
78+
}
7979

80-
public class DynamicFileAppender : IDynamicAppender
81-
{
80+
public class DynamicFileAppender : IDynamicAppender
81+
{
8282
string _loggerName = string.Empty;
8383
IAppender _appender = null;
8484
ILog _log = null;
@@ -96,14 +96,14 @@ public DynamicFileAppender(string loggerName, string appenderName,
9696

9797
public void Dispose()
9898
{
99-
_appender.Close();
99+
_appender.Close();
100100
FileAppenderFactory.RemoveAppender( _loggerName, _appender );
101101
_log = null;
102102
}
103103
}
104104

105105
public class RollingFileAppenderHelper : IDynamicAppender
106-
{
106+
{
107107
string _loggerName = string.Empty;
108108
IAppender _appender = null;
109109
ILog _log = null;
@@ -121,8 +121,8 @@ public RollingFileAppenderHelper(string loggerName, string appenderName,
121121

122122
public void Dispose()
123123
{
124-
_appender.Close();
125-
FileAppenderFactory.RemoveAppender( _loggerName, _appender );
124+
_appender.Close();
125+
FileAppenderFactory.RemoveAppender( _loggerName, _appender );
126126
_log = null;
127127
}
128128
}

‎Synapse.Common/Classes/Logging/LogUtility.cs‎

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.IO;
3+
using System.Linq;
34
using log4net;
45
using log4net.Appender.Dynamic;
56

@@ -18,9 +19,9 @@ public class LogUtility : IDisposable
1819
{
1920
bool _disposed = false;
2021

21-
//public static readonly ILog Default = log4net.LogManager.GetLogger( "SynapseNodeServer" );
22+
//public static readonly ILog Default = log4net.LogManager.GetLogger( "SynapseNodeServer" );
2223

23-
public IDynamicAppender _dynamicAppender = null;
24+
public IDynamicAppender _dynamicAppender = null;
2425
public ILog _logger = null;
2526

2627
public LogUtility()
@@ -34,16 +35,16 @@ public LogUtility()
3435
public void InitDefaultLogger(string loggerName, string appenderName,
3536
string logfileName, string conversionPattern, string levelName = "ALL")
3637
{
37-
//_logger = log4net.LogManager.GetLogger( "SynapseNodeServer" );
38-
_dynamicAppender = new RollingFileAppenderHelper( loggerName, appenderName, logfileName, conversionPattern, levelName );
39-
_logger =_dynamicAppender.Log;
38+
//_logger = log4net.LogManager.GetLogger( "SynapseNodeServer" );
39+
_dynamicAppender = new RollingFileAppenderHelper( loggerName, appenderName, logfileName, conversionPattern, levelName );
40+
_logger = _dynamicAppender.Log;
4041
}
4142

4243
public void InitDynamicFileAppender(string loggerName, string appenderName,
4344
string logfileName, string conversionPattern, string levelName = "ALL")
4445
{
45-
_dynamicAppender = new DynamicFileAppender( loggerName, appenderName, logfileName, conversionPattern, levelName );
46-
_logger = _dynamicAppender.Log;
46+
_dynamicAppender = new DynamicFileAppender( loggerName, appenderName, logfileName, conversionPattern, levelName );
47+
_logger = _dynamicAppender.Log;
4748
}
4849

4950
#region Write/WriteFormat
@@ -77,28 +78,33 @@ public void Write(LogLevel level, object message, Exception ex = null, ILog logg
7778

7879
switch( level )
7980
{
80-
case LogLevel.Debug: logger.Debug( message );
81+
case LogLevel.Debug:
82+
logger.Debug( message );
8183
break;
8284

83-
case LogLevel.Error: logger.Error( message, ex );
85+
case LogLevel.Error:
86+
logger.Error( message, ex );
8487
break;
8588

86-
case LogLevel.Fatal: logger.Fatal( message, ex );
89+
case LogLevel.Fatal:
90+
logger.Fatal( message, ex );
8791
break;
8892

89-
case LogLevel.Info: logger.Info( message );
93+
case LogLevel.Info:
94+
logger.Info( message );
9095
break;
9196

92-
case LogLevel.Warn: logger.Warn( message );
97+
case LogLevel.Warn:
98+
logger.Warn( message );
9399
break;
94100
}
95101
}
96102
#endregion
97103

98-
public void CloseLog()
99-
{
100-
_dynamicAppender.Dispose();
101-
}
104+
public void CloseLog()
105+
{
106+
_dynamicAppender.Dispose();
107+
}
102108

103109
#region IDisposable Members
104110
public void Dispose()
@@ -113,4 +119,23 @@ public void Dispose()
113119
}
114120
#endregion
115121
}
116-
}
122+
123+
public class Log4netHelpers
124+
{
125+
public static string GetLogFileName(string name)
126+
{
127+
var rootAppender = LogManager.GetRepository()
128+
.GetAppenders()
129+
.OfType<log4net.Appender.FileAppender>()
130+
.FirstOrDefault( fa => fa.Name == name );
131+
132+
return rootAppender?.File;
133+
}
134+
135+
public static string GetLogFileFolder(string name)
136+
{
137+
string fullPath = GetLogFileName( name );
138+
return string.IsNullOrWhiteSpace( fullPath ) ? Path.GetDirectoryName( fullPath ) : null;
139+
}
140+
}
141+
}

‎Synapse.Common/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@
3838
// by using the '*' as shown below:
3939
// [assembly: AssemblyVersion("1.0.*")]
4040
[assembly: AssemblyVersion( "0.1.0.0" )]
41-
[assembly: AssemblyFileVersion( "0.1.18027.0" )]
41+
[assembly: AssemblyFileVersion( "0.1.18029.0" )]

‎Synapse.Core/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@
3737
// by using the '*' as shown below:
3838
// [assembly: AssemblyVersion("1.0.*")]
3939
[assembly: AssemblyVersion( "0.1.0.0" )]
40-
[assembly: AssemblyFileVersion( "0.1.18027.0" )]
40+
[assembly: AssemblyFileVersion( "0.1.18029.0" )]

‎Synapse.cli/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
3535
[assembly: AssemblyVersion( "0.1.0.0" )]
36-
[assembly: AssemblyFileVersion( "0.1.18027.0" )]
36+
[assembly: AssemblyFileVersion( "0.1.18029.0" )]

0 commit comments

Comments
 (0)