Merge pull request #1078 from github/timrogers/log-process-id

Add process ID to log file names to ensure uniqueness

Author: timrogers

RELEASENOTES.md

@@ -2,3 +2,4 @@
 - Allow CLI to fail fast when an unauthorized token is provided by preventing retry logic on 401 errors
 - Improve performance when reclaiming a single mannequin with `reclaim-mannequin`
 - Improve logging for `reclaim-mannequin` command
+- Log filename now contains the process id to make sure it is unique

src/Octoshift/Services/OctoLogger.cs

@@ -33,8 +33,9 @@ public class OctoLogger
     public OctoLogger()
     {
         var logStartTime = DateTime.Now;
-        _logFilePath = $"{logStartTime:yyyyMMddHHmmss}.octoshift.log";
-        _verboseFilePath = $"{logStartTime:yyyyMMddHHmmss}.octoshift.verbose.log";
+        var processId = Environment.ProcessId;
+        _logFilePath = $"{logStartTime:yyyyMMddHHmmss}-{processId}.octoshift.log";
+        _verboseFilePath = $"{logStartTime:yyyyMMddHHmmss}-{processId}.octoshift.verbose.log";
 
         if (Environment.GetEnvironmentVariable("GEI_DEBUG_MODE")?.ToUpperInvariant() == "TRUE")
         {

src/OctoshiftCLI.IntegrationTests/TestHelper.cs

@@ -716,7 +716,7 @@ public void AssertNoErrorInLogs(DateTime after)
             var directoryInfo = new DirectoryInfo(GetOsDistPath());
 
             var firstLogFileWithError = directoryInfo.GetFiles("*.octoshift.log")
-                .Select(fi => (Timestamp: DateTime.ParseExact(fi.Name.Split('.').First(), "yyyyMMddHHmmss", null), FileInfo: fi))
+                .Select(fi => (Timestamp: DateTime.ParseExact(fi.Name.Split('.').First().Split('-').First(), "yyyyMMddHHmmss", null), FileInfo: fi))
                 .Where(x => x.Timestamp >= after)
                 .OrderBy(x => x.Timestamp)
                 .Select(x => x.FileInfo)