Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] Windows liveness for nested if statements #680

Merged
merged 13 commits into from
Nov 17, 2023
Merged

[Fix] Windows liveness for nested if statements #680

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1e2ed4e
liveness probe fix
gracewehner Nov 16, 2023
a7e6bfc
remove branch
gracewehner Nov 16, 2023
23d2d99
update /B everywhere
gracewehner Nov 16, 2023
68f32e8
version and release notes
gracewehner Nov 16, 2023
14610bf
cves
gracewehner Nov 16, 2023
2e1dd0b
Merge remote-tracking branch 'origin/main' into grace/win-liveness
gracewehner Nov 16, 2023
5f239c3
get build with eof
gracewehner Nov 17, 2023
b3fac9e
remove null
gracewehner Nov 17, 2023
8350f4b
fix syntax
gracewehner Nov 17, 2023
190d5f1
Merge remote-tracking branch 'origin/main' into grace/win-liveness
gracewehner Nov 17, 2023
158c1aa
use !
gracewehner Nov 17, 2023
aef17ea
remove branch
gracewehner Nov 17, 2023
d3c786f
remove changes
gracewehner Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions otelcollector/build/windows/scripts/livenessprobe.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ set /a durationInMinutes = -1
if "%MAC%" == "" (
rem Non-MAC mode
tasklist /fi "imagename eq MetricsExtension.Native.exe" /fo "table" | findstr MetricsExtension > nul
if %ERRORLEVEL% NEQ 0 (
if !ERRORLEVEL! NEQ 0 (
echo "Metrics Extension is not running (Non-MAC mode)"
exit /B 1
)
Expand All @@ -38,12 +38,12 @@ if "%MAC%" == "" (
)
) else (
tasklist /fi "imagename eq MetricsExtension.Native.exe" /fo "table" | findstr MetricsExtension > nul
if %ERRORLEVEL% NEQ 0 (
if !ERRORLEVEL! NEQ 0 (
echo "Metrics Extension is not running (configuration exists)"
exit /B 1
)
tasklist /fi "imagename eq MonAgentLauncher.exe" /fo "table" | findstr MonAgentLauncher > nul
if %ERRORLEVEL% NEQ 0 (
if !ERRORLEVEL! NEQ 0 (
echo "MonAgentLauncher is not running (configuration exists)"
exit /B 1
)
Expand Down
Loading