Update low CPU activity error message (fixes #1566)

projectkudu · Jul 30, 2015 · 6378074 · 6378074
1 parent 0de53f3
commit 6378074
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Kudu.Core/Infrastructure/IdleManager.cs b/Kudu.Core/Infrastructure/IdleManager.cs
@@ -135,7 +135,8 @@ private static Exception CreateIdleTimeoutException(IProcess process, TimeSpan t
             string message = String.Format(Resources.Error_ProcessAborted,
                                 process.Name + " " + arguments, 
                                 totalWaitDuration.TotalSeconds, 
-                                SettingsKeys.CommandIdleTimeout);
+                                SettingsKeys.CommandIdleTimeout,
+                                SettingsKeys.WebJobsIdleTimeoutInSeconds);
             return new CommandLineException(process.Name, process.Arguments, message)
             {
                 ExitCode = -1,

diff --git a/Kudu.Core/Resources.Designer.cs b/Kudu.Core/Resources.Designer.cs
diff --git a/Kudu.Core/Resources.resx b/Kudu.Core/Resources.resx
@@ -145,7 +145,7 @@
     <value>No log found for '{0}'.</value>
   </data>
   <data name="Error_ProcessAborted" xml:space="preserve">
-    <value>Command '{0}' aborted due to no output and CPU activity for {1:0} seconds.  You may increase {2} setting to solve the issue.</value>
+    <value>Command '{0}' was aborted due to no output nor CPU activity for {1:0} seconds. You can increase the {2} app setting (or {3} if this is a WebJob) if needed.</value>
   </data>
   <data name="Error_ProjectDoesNotExist" xml:space="preserve">
     <value>The specified project '{0}' is not valid. It needs to point to either a csproj/vbproj file or to a directory.</value>