From 28d9b1498357ba16df5fc0fe673714b4b3bea077 Mon Sep 17 00:00:00 2001 From: "Chris.Watts90@outlook.com" Date: Thu, 8 Mar 2018 09:21:04 +0000 Subject: [PATCH] remove console.writelines from code. Add trace log output to DataCenterHelper. #90 --- .../CardReaderService/CardReaderService.cs | 4 ++-- .../CardReaderService/DataCenterHelper.cs | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.cs b/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.cs index 3ecf735..e5bf9ab 100644 --- a/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.cs +++ b/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.cs @@ -106,7 +106,7 @@ namespace CardReaderService _logger.Trace("Card Inserted, ATR: " + atrString + ", and UID is: " + uid); var postObj = new CardDataPost {CardUId = uid}; - DataCenterHelper.PostAsync(postObj, "/api/swipedata"); + DataCenterHelper.PostAsync(_logger, postObj, "/api/swipedata"); _logger.Trace("Posted to Server"); } else @@ -191,7 +191,7 @@ namespace CardReaderService { return false; } - Console.WriteLine(_cardMonitor.GetCurrentState(0)); + _logger.Trace(_cardMonitor.GetCurrentState(0).ToString()); if (_cardMonitor.GetCurrentState(0) == SCRState.Unknown || _cardMonitor.GetCurrentState(0) == SCRState.Unavailable || _cardMonitor.GetCurrentState(0) == (SCRState.Ignore | SCRState.Unavailable) diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderService/DataCenterHelper.cs b/DataCenter_Windows/WindowsDataCenter/CardReaderService/DataCenterHelper.cs index 6bb0452..24e61cb 100644 --- a/DataCenter_Windows/WindowsDataCenter/CardReaderService/DataCenterHelper.cs +++ b/DataCenter_Windows/WindowsDataCenter/CardReaderService/DataCenterHelper.cs @@ -5,13 +5,14 @@ using System.Linq; using System.Net.Http; using System.Text; using System.Threading.Tasks; +using Interfaces; using Newtonsoft.Json; namespace CardReaderService { static class DataCenterHelper { - public static void Post(CardDataPost postObject, string url) + public static void Post(ILogger logger, CardDataPost postObject, string url) { var endpointConfig = ConfigurationHandler.ConfigurationHandler.GetConfiguration("DataCenterServiceEndpoint") ?? "http://localhost:8800"; @@ -22,10 +23,10 @@ namespace CardReaderService var content = new StringContent(jsonObject, Encoding.UTF8, "application/json"); try { - Console.WriteLine("Writing"); + logger.Trace("Writing"); var fullUrl = endpointConfig + url; var response = client.PostAsync(fullUrl, content).Result; - Console.WriteLine("Written"); + logger.Trace("Written"); } catch (Exception) { @@ -35,9 +36,9 @@ namespace CardReaderService } } - public static Task PostAsync(CardDataPost postObject, string url) + public static Task PostAsync(ILogger logger, CardDataPost postObject, string url) { - return Task.Run(() => Post(postObject, url)); + return Task.Run(() => Post(logger, postObject, url)); } }