timeout set

shukriadams · May 1, 2024 · 7824851 · 7824851
1 parent 0c4f81a
commit 7824851
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/Tetrifact.Core/ArchiveService.cs b/src/Tetrifact.Core/ArchiveService.cs
@@ -193,7 +193,7 @@ private void Archive7Zip(string packageId, string archivePathTemp)
                 long cacheUpdateIncrements = manifest.Files.Count / 100;
                 long counter = 0;
 
-                manifest.Files.AsParallel().ForAll(delegate (ManifestItem file)
+                manifest.Files.AsParallel().WithDegreeOfParallelism(_settings.ArchiveCPUThreads).ForAll(delegate (ManifestItem file)
                 {
                     string targetPath = Path.Join(tempDir1, file.Path);
                     List<string> knownDirectories = new List<string>();
@@ -263,7 +263,7 @@ private void Archive7Zip(string packageId, string archivePathTemp)
             // -aoa swtich forces overwriting of existing zip file should it exist
             string command = $"{_settings.SevenZipBinaryPath} -aoa a -tzip -mx={_settings.ArchiveCPUThreads} -mmt=on {archivePathTemp} {tempDir2}/*";
 
-            ShellResult result = Shell.Run(command);
+            ShellResult result = Shell.Run(command, false, 3600000); // set timeout to 1 hour
             TimeSpan compressTaken = DateTime.Now - compressStart;
             if (result.ExitCode == 0)
             {

diff --git a/src/Tetrifact.Core/Shell.cs b/src/Tetrifact.Core/Shell.cs
@@ -26,8 +26,9 @@ public class Shell
         /// Runs a shell command SYNCHRONOUSLY, returns a tuple with exit code, stdout and stderr.
         /// </summary>
         /// <param name="command"></param>
+        /// <param name="timeout">milliseconds to timeout</param>
         /// <returns></returns>
-        public static ShellResult Run(string command, bool verbose=false)
+        public static ShellResult Run(string command, bool verbose=false, int timeout= 50000)
         {
             Process cmd = new Process();
 
@@ -49,8 +50,6 @@ public static ShellResult Run(string command, bool verbose=false)
             cmd.StartInfo.UseShellExecute = false;
             List<string> stdOut = new List<string>();
             List<string> stdErr = new List<string>();
-            int timeout = 50000;
-
 
             //cmd.Start();
 
@@ -91,7 +90,6 @@ public static ShellResult Run(string command, bool verbose=false)
                 cmd.StandardInput.Flush();
                 cmd.StandardInput.Close();
 
-
                 while (!cmd.StandardOutput.EndOfStream)
                 {
                     string line = cmd.StandardOutput.ReadLine();