Set the scheduled task timeout

Use the current WinRM operation timeout for the scheduled task timeout
WinRb · Oct 15, 2015 · c48387f · c48387f
1 parent 7ac1ba4
commit c48387f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/winrm-elevated/runner.rb b/lib/winrm-elevated/runner.rb
@@ -68,7 +68,7 @@ def elevated_shell_script_content
       def wrap_in_scheduled_task(script_text, username, password)
         ps_script = WinRM::PowershellScript.new(script_text)
         "powershell -executionpolicy bypass -file \"#{@elevated_shell_path}\" " \
-          "-username \"#{username}\" -password \"#{password}\" " \
+          "-username \"#{username}\" -password \"#{password}\" -timeout \"#{@winrm_service.timeout}\" " \
           "-encoded_command \"#{ps_script.encoded}\""
       end
     end

diff --git a/lib/winrm-elevated/scripts/elevated_shell.ps1 b/lib/winrm-elevated/scripts/elevated_shell.ps1
@@ -1,4 +1,4 @@
-param([String]$username, [String]$password, [String]$encoded_command)
+param([String]$username, [String]$password, [String]$encoded_command, [String]$timeout)
 
 $task_name = "WinRM_Elevated_Shell"
 $out_file = "$env:Temp\winrm_elevated_out.log"
@@ -37,7 +37,7 @@ $task_xml = @'
     <Hidden>false</Hidden>
     <RunOnlyIfIdle>false</RunOnlyIfIdle>
     <WakeToRun>false</WakeToRun>
-    <ExecutionTimeLimit>PT2H</ExecutionTimeLimit>
+    <ExecutionTimeLimit>{timeout}</ExecutionTimeLimit>
     <Priority>4</Priority>
   </Settings>
   <Actions Context="Author">
@@ -53,6 +53,7 @@ $arguments = "/c powershell.exe -EncodedCommand $encoded_command &gt; $out_file
 
 $task_xml = $task_xml.Replace("{arguments}", $arguments)
 $task_xml = $task_xml.Replace("{username}", $username)
+$task_xml = $task_xml.Replace("{timeout}", $timeout)
 
 $schedule = New-Object -ComObject "Schedule.Service"
 $schedule.Connect()