Merge pull request #2054 from hvitved/csharp/autobuilder/log-cleanup

C#: Cleanup more files after failed autobuilder attempt

Author: calumgrant

csharp/autobuilder/Semmle.Autobuild/Autobuilder.cs

@@ -262,12 +262,23 @@ BuildScript CheckExtractorRun(bool warnOnFailure) =>
                         BuildScript.DeleteDirectory(Actions.GetEnvironmentVariable("TRAP_FOLDER"));
                     var cleanSourceArchive =
                         BuildScript.DeleteDirectory(Actions.GetEnvironmentVariable("SOURCE_ARCHIVE"));
-                    var cleanExtractorLog =
-                        BuildScript.DeleteFile(Extractor.GetCSharpLogPath());
+                    var tryCleanExtractorArgsLogs =
+                        BuildScript.Create(actions =>
+                        {
+                            foreach (var file in Extractor.GetCSharpArgsLogs())
+                                try
+                                {
+                                    actions.FileDelete(file);
+                                }
+                                catch // lgtm[cs/catch-of-all-exceptions] lgtm[cs/empty-catch-block]
+                                { }
+                            return 0;
+                        });
                     var attemptExtractorCleanup =
                         BuildScript.Try(cleanTrapFolder) &
                         BuildScript.Try(cleanSourceArchive) &
-                        BuildScript.Try(cleanExtractorLog);
+                        tryCleanExtractorArgsLogs &
+                        BuildScript.DeleteFile(Extractor.GetCSharpLogPath());
 
                     /// <summary>
                     /// Execute script `s` and check that the C# extractor has been executed.

csharp/extractor/Semmle.Extraction.CSharp/Analyser.cs

@@ -450,8 +450,7 @@ public bool LogRoslynArgs(string[] roslynArgs, string extractorVersion)
             LogExtractorInfo(extractorVersion);
             Logger.Log(Severity.Info, $"  Arguments to Roslyn: {string.Join(' ', roslynArgs)}");
 
-            var csharpLogDir = Extractor.GetCSharpLogDirectory();
-            var tempFile = Path.Combine(csharpLogDir, $"csharp.{Path.GetRandomFileName()}.txt");
+            var tempFile = Extractor.GetCSharpArgsLogPath(Path.GetRandomFileName());
 
             bool argsWritten;
             using (var streamWriter = new StreamWriter(new FileStream(tempFile, FileMode.Append, FileAccess.Write)))
@@ -461,7 +460,7 @@ public bool LogRoslynArgs(string[] roslynArgs, string extractorVersion)
             }
 
             var hash = FileUtils.ComputeFileHash(tempFile);
-            var argsFile = Path.Combine(csharpLogDir, $"csharp.{hash}.txt");
+            var argsFile = Extractor.GetCSharpArgsLogPath(hash);
 
             if (argsWritten)
                 Logger.Log(Severity.Info, $"  Arguments have been written to {argsFile}");

csharp/extractor/Semmle.Extraction.CSharp/Extractor.cs

@@ -391,7 +391,19 @@ public static void ExtractStandalone(
         public static string GetCSharpLogPath() =>
             Path.Combine(GetCSharpLogDirectory(), "csharp.log");
 
-        public static string GetCSharpLogDirectory()
+        /// <summary>
+        /// Gets the path to a `csharp.{hash}.txt` file written to by the C# extractor.
+        /// </summary>
+        public static string GetCSharpArgsLogPath(string hash) =>
+            Path.Combine(GetCSharpLogDirectory(), $"csharp.{hash}.txt");
+
+        /// <summary>
+        /// Gets a list of all `csharp.{hash}.txt` files currently written to the log directory.
+        /// </summary>
+        public static IEnumerable<string> GetCSharpArgsLogs() =>
+            Directory.EnumerateFiles(GetCSharpLogDirectory(), "csharp.*.txt");
+
+        static string GetCSharpLogDirectory()
         {
             string snapshot = Environment.GetEnvironmentVariable("ODASA_SNAPSHOT");
             string buildErrorDir = Environment.GetEnvironmentVariable("ODASA_BUILD_ERROR_DIR");