Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit d74a8d6

Browse files
shanashana
authored
Merge pull request #727 from github-for-unity/fixes/cleanup-trace-logging
Clean up trace logging, commented-out code and superfluous whitespace
2 parents 8b93396 + 13c6807 commit d74a8d6

32 files changed

+370
-343
lines changed

‎script

‎src/GitHub.Api/Application/ApiClient.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,6 @@ private async Task<GitHubRepository> CreateRepositoryInternal(string repositoryN
154154
{
155155
try
156156
{
157-
logger.Trace("Creating repository");
158-
159157
var user = await GetCurrentUser();
160158
var keychainAdapter = keychain.Connect(OriginalUrl);
161159

@@ -209,8 +207,6 @@ private async Task GetOrganizationInternal(Action<Organization[]> onSuccess, Act
209207
{
210208
try
211209
{
212-
logger.Trace("Getting Organizations");
213-
214210
var user = await GetCurrentUser();
215211
var keychainAdapter = keychain.Connect(OriginalUrl);
216212

‎src/GitHub.Api/Application/ApplicationManagerBase.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ protected void Initialize()
4343

4444
public void Run(bool firstRun)
4545
{
46-
Logger.Trace("Run - CurrentDirectory {0}", NPath.CurrentDirectory);
4746
isBusy = true;
4847

4948
var thread = new Thread(obj =>
@@ -78,8 +77,6 @@ public void Run(bool firstRun)
7877

7978
public ITask InitializeRepository()
8079
{
81-
//Logger.Trace("Running Repository Initialize");
82-
8380
var targetPath = NPath.CurrentDirectory;
8481

8582
var unityYamlMergeExec = Environment.UnityApplicationContents.Combine("Tools", "UnityYAMLMerge" + Environment.ExecutableExtension);
@@ -136,8 +133,6 @@ public void RestartRepository()
136133

137134
protected void SetupMetrics(string unityVersion, bool firstRun, Guid instanceId)
138135
{
139-
//Logger.Trace("Setup metrics");
140-
141136
string userId = null;
142137
if (UserSettings.Exists(Constants.GuidKey))
143138
{

‎src/GitHub.Api/Authentication/Keychain.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,6 @@ public async Task<IKeychainAdapter> Load(UriString host)
107107
var keychainAdapter = FindOrCreateAdapter(host);
108108
var connection = GetConnection(host);
109109

110-
//logger.Trace($@"Loading KeychainAdapter Host:""{host}"" Cached Username:""{cachedConnection.Username}""");
111-
112110
var keychainItem = await credentialManager.Load(host);
113111
if (keychainItem == null)
114112
{
@@ -123,7 +121,6 @@ public async Task<IKeychainAdapter> Load(UriString host)
123121
logger.Warning("Keychain Username:\"{0}\" does not match cached Username:\"{1}\"; Hopefully it works", keychainItem.Username, connection.Username);
124122
}
125123

126-
//logger.Trace("Loaded from Credential Manager Host:\"{0}\" Username:\"{1}\"", keychainItem.Host, keychainItem.Username);
127124
keychainAdapter.Set(keychainItem);
128125
}
129126
return keychainAdapter;
@@ -142,14 +139,11 @@ private KeychainAdapter FindOrCreateAdapter(UriString host)
142139

143140
public void Initialize()
144141
{
145-
//logger.Trace("Initialize");
146142
LoadConnectionsFromDisk();
147143
}
148144

149145
public async Task Clear(UriString host, bool deleteFromCredentialManager)
150146
{
151-
//logger.Trace("Clear Host:{0}", host);
152-
153147
Guard.ArgumentNotNull(host, nameof(host));
154148

155149
RemoveConnection(host);
@@ -160,8 +154,6 @@ public async Task Clear(UriString host, bool deleteFromCredentialManager)
160154

161155
public async Task Save(UriString host)
162156
{
163-
//logger.Trace("Save: {0}", host);
164-
165157
Guard.ArgumentNotNull(host, nameof(host));
166158

167159
var keychainAdapter = await AddCredential(host);
@@ -170,8 +162,6 @@ public async Task Save(UriString host)
170162

171163
public void SetCredentials(ICredential credential)
172164
{
173-
//logger.Trace("SetCredentials Host:{0}", credential.Host);
174-
175165
Guard.ArgumentNotNull(credential, nameof(credential));
176166

177167
var keychainAdapter = GetKeychainAdapter(credential.Host);
@@ -180,8 +170,6 @@ public void SetCredentials(ICredential credential)
180170

181171
public void SetToken(UriString host, string token, string username)
182172
{
183-
//logger.Trace("SetToken Host:{0}", host);
184-
185173
Guard.ArgumentNotNull(host, nameof(host));
186174
Guard.ArgumentNotNull(token, nameof(token));
187175
Guard.ArgumentNotNull(username, nameof(username));
@@ -192,7 +180,6 @@ public void SetToken(UriString host, string token, string username)
192180

193181
private void LoadConnectionsFromDisk()
194182
{
195-
//logger.Trace("ReadCacheFromDisk Path:{0}", cachePath.ToString());
196183
if (cachePath.FileExists())
197184
{
198185
var json = cachePath.ReadAllText();
@@ -216,7 +203,6 @@ private void LoadConnectionsFromDisk()
216203

217204
private void SaveConnectionsToDisk(bool raiseChangedEvent = true)
218205
{
219-
//logger.Trace("WriteCacheToDisk Count:{0} Path:{1}", connectionCache.Count, cachePath.ToString());
220206
try
221207
{
222208
var json = connections.Values.ToJson();

‎src/GitHub.Api/Authentication/LoginManager.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ public async Task<LoginResultData> ContinueLogin(LoginResultData loginResultData
106106
var password = keychainAdapter.Credential.Token;
107107
try
108108
{
109-
logger.Trace("2FA Continue");
110109
loginResultData = await TryLogin(host, username, password, twofacode);
111110

112111
if (loginResultData.Code == LoginResultCodes.Success)

‎src/GitHub.Api/Events/RepositoryWatcher.cs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public void Start()
8080
}
8181

8282
Logger.Trace("Watching Path: \"{0}\"", paths.RepositoryPath.ToString());
83-
8483
running = true;
8584
pauseEvent.Reset();
8685
Task.Factory.StartNew(WatcherLoop, cancellationToken, TaskCreationOptions.None, TaskScheduler.Default);
@@ -89,21 +88,14 @@ public void Start()
8988
public void Stop()
9089
{
9190
if (!running)
92-
{
93-
//Logger.Warning("Watcher already stopped");
9491
return;
95-
}
96-
97-
//Logger.Trace("Stopping watcher");
9892

9993
running = false;
10094
pauseEvent.Set();
10195
}
10296

10397
private void WatcherLoop()
10498
{
105-
//Logger.Trace("Starting watcher");
106-
10799
while (running)
108100
{
109101
if (cancellationToken.IsCancellationRequested)
@@ -136,9 +128,7 @@ public int CheckAndProcessEvents()
136128
var fileEvents = nativeInterface.GetEvents();
137129
if (fileEvents.Length > 0)
138130
{
139-
//Logger.Trace("Handling {0} Events", fileEvents.Length);
140131
processedEventCount = ProcessEvents(fileEvents);
141-
//Logger.Trace("Processed {0} Events", processedEventCount);
142132
}
143133

144134
lastCountOfProcessedEvents = processedEventCount;
@@ -164,8 +154,6 @@ private int ProcessEvents(Event[] fileEvents)
164154
break;
165155
}
166156

167-
//Logger.Trace(fileEvent.Describe());
168-
169157
var eventDirectory = new NPath(fileEvent.Directory);
170158
var fileA = eventDirectory.Combine(fileEvent.FileA);
171159

@@ -215,28 +203,24 @@ private int FireEvents(HashSet<EventType> events)
215203
int eventsProcessed = 0;
216204
if (events.Contains(EventType.ConfigChanged))
217205
{
218-
//Logger.Trace("ConfigChanged");
219206
ConfigChanged?.Invoke();
220207
eventsProcessed++;
221208
}
222209

223210
if (events.Contains(EventType.HeadChanged))
224211
{
225-
//Logger.Trace("HeadChanged");
226212
HeadChanged?.Invoke();
227213
eventsProcessed++;
228214
}
229215

230216
if (events.Contains(EventType.LocalBranchesChanged))
231217
{
232-
//Logger.Trace("LocalBranchesChanged");
233218
LocalBranchesChanged?.Invoke();
234219
eventsProcessed++;
235220
}
236221

237222
if (events.Contains(EventType.RemoteBranchesChanged))
238223
{
239-
//Logger.Trace("RemoteBranchesChanged");
240224
RemoteBranchesChanged?.Invoke();
241225
eventsProcessed++;
242226
}
@@ -245,22 +229,19 @@ private int FireEvents(HashSet<EventType> events)
245229
{
246230
if (!events.Contains(EventType.RepositoryChanged))
247231
{
248-
//Logger.Trace("IndexChanged");
249232
IndexChanged?.Invoke();
250233
eventsProcessed++;
251234
}
252235
}
253236

254237
if (events.Contains(EventType.RepositoryChanged))
255238
{
256-
//Logger.Trace("RepositoryChanged");
257239
RepositoryChanged?.Invoke();
258240
eventsProcessed++;
259241
}
260242

261243
if (events.Contains(EventType.RepositoryCommitted))
262244
{
263-
//Logger.Trace("RepositoryCommitted");
264245
RepositoryCommitted?.Invoke();
265246
eventsProcessed++;
266247
}

0 commit comments

Comments
 (0)