Repository: reef Updated Branches: refs/heads/master 0b8da4cfc -> db4ffaec6
[REEF-1502] Fix remaining Core .NET incompatibilities in REEF.Driver. This check in addresses the issue by replacing the ConsoleTextWriter class which is unavailable in Core .NET with TextWriterTraceListener writing to standard out. Necessary changes rippled into the Bridge, Examples, and Utilities projects. JIRA: [REEF-1502](https://issues.apache.org/jira/browse/REEF-1502) Pull Request: This closes #1110 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/db4ffaec Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/db4ffaec Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/db4ffaec Branch: refs/heads/master Commit: db4ffaec659a139797dd00227985e201ca88c2f5 Parents: 0b8da4c Author: Doug Service <[email protected]> Authored: Tue Aug 30 19:10:28 2016 -0700 Committer: Markus Weimer <[email protected]> Committed: Wed Aug 31 14:56:28 2016 -0700 ---------------------------------------------------------------------- lang/cs/Org.Apache.REEF.Bridge/JavaClrBridge.cpp | 2 +- .../Org.Apache.REEF.Driver/Defaults/DefaultCustomTraceListener.cs | 3 ++- .../cs/Org.Apache.REEF.Examples.AllHandlers/HelloTraceListener.cs | 2 +- lang/cs/Org.Apache.REEF.Utilities/Logging/Logger.cs | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/db4ffaec/lang/cs/Org.Apache.REEF.Bridge/JavaClrBridge.cpp ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Bridge/JavaClrBridge.cpp b/lang/cs/Org.Apache.REEF.Bridge/JavaClrBridge.cpp index 53edb0c..e7b272a 100644 --- a/lang/cs/Org.Apache.REEF.Bridge/JavaClrBridge.cpp +++ b/lang/cs/Org.Apache.REEF.Bridge/JavaClrBridge.cpp @@ -336,7 +336,7 @@ JNIEXPORT void JNICALL Java_org_apache_reef_javabridge_NativeInterop_clrBuffered try { if (!JavaClrBridge::LoggerWrapper::initialized) { ManagedLog::LOGGER->Log("Initializing CLRBufferedLogHandler in java bridge..."); - JavaClrBridge::LoggerWrapper::logger->Listeners->Add(gcnew System::Diagnostics::ConsoleTraceListener()); + JavaClrBridge::LoggerWrapper::logger->Listeners->Add(gcnew System::Diagnostics::TextWriterTraceListener(System::Console::Out)); JavaClrBridge::LoggerWrapper::initialized = true; } http://git-wip-us.apache.org/repos/asf/reef/blob/db4ffaec/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultCustomTraceListener.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultCustomTraceListener.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultCustomTraceListener.cs index 945f245..dc37953 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultCustomTraceListener.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultCustomTraceListener.cs @@ -15,6 +15,7 @@ // specific language governing permissions and limitations // under the License. +using System; using System.Diagnostics; using Org.Apache.REEF.Tang.Annotations; @@ -27,7 +28,7 @@ namespace Org.Apache.REEF.Driver.Defaults [Inject] public DefaultCustomTraceListener() { - _listener = new ConsoleTraceListener(); + _listener = new TextWriterTraceListener(Console.Out); } public override void Write(string message) http://git-wip-us.apache.org/repos/asf/reef/blob/db4ffaec/lang/cs/Org.Apache.REEF.Examples.AllHandlers/HelloTraceListener.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples.AllHandlers/HelloTraceListener.cs b/lang/cs/Org.Apache.REEF.Examples.AllHandlers/HelloTraceListener.cs index 5cec48e..121dd65 100644 --- a/lang/cs/Org.Apache.REEF.Examples.AllHandlers/HelloTraceListener.cs +++ b/lang/cs/Org.Apache.REEF.Examples.AllHandlers/HelloTraceListener.cs @@ -30,7 +30,7 @@ namespace Org.Apache.REEF.Examples.AllHandlers [Inject] private HelloTraceListener() { - _listener = new ConsoleTraceListener(); + _listener = new TextWriterTraceListener(System.Console.Out); } public override void Write(string message) http://git-wip-us.apache.org/repos/asf/reef/blob/db4ffaec/lang/cs/Org.Apache.REEF.Utilities/Logging/Logger.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Utilities/Logging/Logger.cs b/lang/cs/Org.Apache.REEF.Utilities/Logging/Logger.cs index 88772be..ec05ec2 100644 --- a/lang/cs/Org.Apache.REEF.Utilities/Logging/Logger.cs +++ b/lang/cs/Org.Apache.REEF.Utilities/Logging/Logger.cs @@ -64,7 +64,7 @@ namespace Org.Apache.REEF.Utilities.Logging if (TraceListeners.Count == 0) { // before customized listener is added, we would need to log to console - _traceSource.Listeners.Add(new ConsoleTraceListener()); + _traceSource.Listeners.Add(new TextWriterTraceListener(Console.Out)); } else {
