Skip to content

Commit 4a9a64c

Browse files
Support Test Proxy logging error output into a different log file (Azure#38771)
Co-authored-by: alzimmermsft <[email protected]>
1 parent 6d7ee6b commit 4a9a64c

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

eng/common/testproxy/publish-proxy-logs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ steps:
55
- pwsh: |
66
New-Item -ItemType Directory -Force "${{ parameters.rootFolder }}/proxy-logs"
77
Copy-Item -Path "${{ parameters.rootFolder }}/test-proxy.log" -Destination "${{ parameters.rootFolder }}/proxy-logs/proxy.log"
8+
Copy-Item -Path "${{ parameters.rootFolder }}/test-proxy-error.log" -Destination "${{ parameters.rootFolder }}/proxy-logs/proxy-error.log"
89
displayName: Copy Log File
910
condition: succeededOrFailed()
1011

eng/common/testproxy/test-proxy-standalone-tool.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,16 @@ steps:
5151
- pwsh: |
5252
$Process = Start-Process $(PROXY_EXE) `
5353
-ArgumentList "start -u --storage-location ${{ parameters.rootFolder }}" `
54-
-NoNewWindow -PassThru -RedirectStandardOutput ${{ parameters.rootFolder }}/test-proxy.log
54+
-NoNewWindow -PassThru -RedirectStandardOutput ${{ parameters.rootFolder }}/test-proxy.log `
55+
-RedirectStandardError ${{ parameters.rootFolder }}/test-proxy-error.log
5556
5657
Write-Host "##vso[task.setvariable variable=PROXY_PID]$($Process.Id)"
5758
displayName: 'Run the testproxy - windows'
5859
condition: and(succeeded(), eq(variables['Agent.OS'],'Windows_NT'), ${{ parameters.condition }})
5960
6061
# nohup does NOT continue beyond the current session if you use it within powershell
6162
- bash: |
62-
nohup $(PROXY_EXE) &>${{ parameters.rootFolder }}/test-proxy.log &
63+
nohup $(PROXY_EXE) 1>${{ parameters.rootFolder }}/test-proxy.log 2>${{ parameters.rootFolder }}/test-proxy-error.log &
6364
6465
echo $! > $(Build.SourcesDirectory)/test-proxy.pid
6566
echo "##vso[task.setvariable variable=PROXY_PID]$(cat $(Build.SourcesDirectory)/test-proxy.pid)"

eng/common/testproxy/test-proxy-tool.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ steps:
5555
- pwsh: |
5656
$Process = Start-Process $(Build.BinariesDirectory)/test-proxy/test-proxy.exe `
5757
-ArgumentList "start -u --storage-location ${{ parameters.rootFolder }}" `
58-
-NoNewWindow -PassThru -RedirectStandardOutput ${{ parameters.rootFolder }}/test-proxy.log
58+
-NoNewWindow -PassThru -RedirectStandardOutput ${{ parameters.rootFolder }}/test-proxy.log `
59+
-RedirectStandardError ${{ parameters.rootFolder }}/test-proxy-error.log
5960
6061
Write-Host "##vso[task.setvariable variable=PROXY_PID]$($Process.Id)"
6162
displayName: 'Run the testproxy - windows'
@@ -65,7 +66,7 @@ steps:
6566
6667
# nohup does NOT continue beyond the current session if you use it within powershell
6768
- bash: |
68-
nohup $(Build.BinariesDirectory)/test-proxy/test-proxy &>${{ parameters.rootFolder }}/test-proxy.log &
69+
nohup $(Build.BinariesDirectory)/test-proxy/test-proxy 1>${{ parameters.rootFolder }}/test-proxy.log 2>${{ parameters.rootFolder }}/test-proxy-error.log &
6970
7071
echo $! > $(Build.SourcesDirectory)/test-proxy.pid
7172
echo "##vso[task.setvariable variable=PROXY_PID]$(cat $(Build.SourcesDirectory)/test-proxy.pid)"

0 commit comments

Comments
 (0)