Skip to content

Commit 437957d

Browse files
nulltokennulltoken
committed
Counter proposal
1 parent 959453b commit 437957d

11 files changed

Lines changed: 62 additions & 164 deletions

File tree

‎LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
<Compile Include="TestHelpers\SelfCleaningDirectory.cs" />
125125
<Compile Include="TestHelpers\SignatureExtensions.cs" />
126126
<Compile Include="TestHelpers\SkippableFactAttribute.cs" />
127-
<Compile Include="TraceFixture.cs" />
128127
<Compile Include="TreeDefinitionFixture.cs" />
129128
<Compile Include="TreeFixture.cs" />
130129
<Compile Include="UnstageFixture.cs" />
@@ -151,4 +150,4 @@
151150
<Target Name="AfterBuild">
152151
</Target>
153152
-->
154-
</Project>
153+
</Project>

‎LibGit2Sharp.Tests/TestHelpers/DirectoryHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static void DeleteDirectory(string directoryPath)
4747

4848
if (!Directory.Exists(directoryPath))
4949
{
50-
System.Diagnostics.Trace.WriteLine(
50+
Trace.WriteLine(
5151
string.Format("Directory '{0}' is missing and can't be removed.",
5252
directoryPath));
5353

‎LibGit2Sharp.Tests/TraceFixture.cs‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎LibGit2Sharp/Core/Handles/SafeHandleBase.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ protected override void Dispose(bool disposing)
3535
{
3636
if (!disposing && !IsInvalid)
3737
{
38-
System.Diagnostics.Trace.WriteLine(string.Format(CultureInfo.InvariantCulture, "A {0} handle wrapper has not been properly disposed.", GetType().Name));
38+
Trace.WriteLine(string.Format(CultureInfo.InvariantCulture, "A {0} handle wrapper has not been properly disposed.", GetType().Name));
3939
#if LEAKS
4040
Trace.WriteLine(trace);
4141
#endif
42-
System.Diagnostics.Trace.WriteLine("");
42+
Trace.WriteLine("");
4343
}
4444

4545
base.Dispose(disposing);

‎LibGit2Sharp/Core/NullLogger.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
namespace LibGit2Sharp.Core
2+
{
3+
internal class NullLogger : ILibGit2SharpLog
4+
{
5+
private NullLogger() { }
6+
7+
public static readonly NullLogger Instance = new NullLogger();
8+
9+
public void Debug(string messageFormat, params object[] args) { }
10+
public void Info(string messageFormat, params object[] args) { }
11+
public void Error(string messageFormat, params object[] args) { }
12+
}
13+
}

‎LibGit2Sharp/GlobalSettings.cs‎

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using LibGit2Sharp.Core;
3-
using LibGit2Sharp.Handlers;
43

54
namespace LibGit2Sharp
65
{
@@ -11,7 +10,8 @@ public static class GlobalSettings
1110
{
1211
private static readonly Lazy<Version> version = new Lazy<Version>(Version.Build);
1312

14-
private static TraceConfiguration traceConfiguration = TraceConfiguration.None;
13+
internal static ILibGit2SharpLog internalLogger = NullLogger.Instance;
14+
internal static TraceLevel internalMaxTraceLevel = TraceLevel.None;
1515

1616
/// <summary>
1717
/// Returns all the optional features that were compiled into
@@ -44,7 +44,7 @@ public static Version Version
4444
/// with the server This is not commonly
4545
/// used: some callers may want to re-use an existing connection to
4646
/// perform fetch / push operations to a remote.
47-
///
47+
///
4848
/// Note that this configuration is global to an entire process
4949
/// and does not honor application domains.
5050
/// </summary>
@@ -88,34 +88,41 @@ public static void UnregisterSmartSubtransport<T>(SmartSubtransportRegistration<
8888
registration.Free();
8989
}
9090

91-
/// <summary>
92-
/// Registers a new <see cref="TraceConfiguration"/> to receive
93-
/// trace information from libgit2.
94-
///
95-
/// Note that this configuration is global to an entire process
96-
/// and does not honor application domains.
97-
/// </summary>
98-
public static TraceConfiguration TraceConfiguration
91+
public static void RegisterLogger(TraceLevel maxLevel, ILibGit2SharpLog logger)
9992
{
100-
set
93+
if (logger == null || maxLevel == TraceLevel.None)
10194
{
102-
Ensure.ArgumentNotNull(value, "value");
103-
104-
traceConfiguration = value;
105-
106-
if (traceConfiguration.Level == TraceLevel.None)
107-
{
108-
Proxy.git_trace_set(0, null);
109-
}
110-
else
111-
{
112-
Proxy.git_trace_set(value.Level, value.GitTraceHandler);
113-
}
95+
// TODO: Threadsafe impl
96+
internalLogger = NullLogger.Instance;
97+
internalMaxTraceLevel = TraceLevel.None;
98+
Proxy.git_trace_set(0, null);
11499
}
115100

116-
get
101+
internalLogger = logger;
102+
internalMaxTraceLevel = maxLevel;
103+
Proxy.git_trace_set(maxLevel, t);
104+
}
105+
106+
private static void t(TraceLevel level, IntPtr msg)
107+
{
108+
string message = LaxUtf8Marshaler.FromNative(msg);
109+
110+
switch (level)
117111
{
118-
return traceConfiguration;
112+
case TraceLevel.Debug:
113+
internalLogger.Debug(message);
114+
break;
115+
116+
case TraceLevel.Info:
117+
internalLogger.Info(message);
118+
break;
119+
120+
case TraceLevel.Error:
121+
internalLogger.Error(message);
122+
break;
123+
124+
default:
125+
throw new InvalidOperationException();
119126
}
120127
}
121128
}

‎LibGit2Sharp/ILibGit2SharpLog.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
namespace LibGit2Sharp
2+
{
3+
public interface ILibGit2SharpLog
4+
{
5+
void Debug(string messageFormat, params object[] args);
6+
void Info(string messageFormat, params object[] args);
7+
void Error(string messageFormat, params object[] args);
8+
}
9+
}

‎LibGit2Sharp/LibGit2Sharp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<Compile Include="Core\GitIndexReucEntry.cs" />
8484
<Compile Include="Core\Handles\IndexNameEntrySafeHandle.cs" />
8585
<Compile Include="Core\Handles\IndexReucEntrySafeHandle.cs" />
86+
<Compile Include="Core\NullLogger.cs" />
8687
<Compile Include="EntryExistsException.cs" />
8788
<Compile Include="IBelongToARepository.cs" />
8889
<Compile Include="IndexNameEntryCollection.cs" />
@@ -138,8 +139,7 @@
138139
<Compile Include="StageOptions.cs" />
139140
<Compile Include="StatusOptions.cs" />
140141
<Compile Include="SimilarityOptions.cs" />
141-
<Compile Include="Trace.cs" />
142-
<Compile Include="TraceConfiguration.cs" />
142+
<Compile Include="ILibGit2SharpLog.cs" />
143143
<Compile Include="TraceLevel.cs" />
144144
<Compile Include="UnbornBranchException.cs" />
145145
<Compile Include="LockedFileException.cs" />

‎LibGit2Sharp/Trace.cs‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎LibGit2Sharp/TraceConfiguration.cs‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)