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

Revert changes in video recorder #2603

Merged
merged 1 commit into from
Jan 21, 2025
Merged

Revert changes in video recorder #2603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
paths-ignore:
- '**.md'
- '.*'
pull_request_target:
pull_request:
paths-ignore:
- '**.md'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm-chart-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ jobs:
retry_wait_seconds: 60
command: NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build
- name: Login Docker Hub
run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" || true
env:
DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
Expand Down
6 changes: 3 additions & 3 deletions Video/video.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ ts_format=${SE_LOG_TIMESTAMP_FORMAT:-"%Y-%m-%d %H:%M:%S,%3N"}
process_name="video.recorder"

if [ "${SE_VIDEO_RECORD_STANDALONE}" = "true" ]; then
JQ_SESSION_ID_QUERY=".value.nodes[-1]?.slots[-1]?.session?.sessionId"
JQ_SESSION_ID_QUERY=".value.nodes[]?.slots[]?.session?.sessionId"
SE_NODE_PORT=${SE_NODE_PORT:-"4444"}
NODE_STATUS_ENDPOINT="$(/opt/bin/video_gridUrl.sh)/status"
else
JQ_SESSION_ID_QUERY=".[-1]?.node?.slots | .[-1]?.session?.sessionId"
JQ_SESSION_ID_QUERY=".[]?.node?.slots | .[0]?.session?.sessionId"
SE_NODE_PORT=${SE_NODE_PORT:-"5555"}
NODE_STATUS_ENDPOINT="${SE_SERVER_PROTOCOL}://${DISPLAY_CONTAINER_NAME}:${SE_NODE_PORT}/status"
fi
Expand Down Expand Up @@ -259,7 +259,7 @@ else
fi
echo "$(date -u +"${ts_format}") [${process_name}] - Video recording started"
sleep ${poll_interval}
elif [[ "$recording_started" = "true" && ("$session_id" != "$prev_session_id" || "$session_id" == "null" || "$session_id" == "") ]]; then
elif [[ "$session_id" != "$prev_session_id" && "$recording_started" = "true" ]]; then
stop_recording
wait_for_file_integrity
if [[ $max_recorded_count -gt 0 ]] && [[ $recorded_count -ge $max_recorded_count ]]; then
Expand Down
2 changes: 1 addition & 1 deletion Video/video_graphQLQuery.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

max_time=1
retry_time=2
retry_time=3

# Define parameters
SESSION_ID=$1
Expand Down
Loading