Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 24 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,35 @@ jobs:
name: Test (${{ matrix.target }})
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
with:
submodules: true

- name: Install Rust toolchain
run: |
rustup update --no-self-update nightly
rustup target add ${{ matrix.target }} --toolchain nightly

- name: Cache Cargo registry
uses: actions/cache@v3
with:
path: |
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-registry-

- name: Cache Cargo build
uses: actions/cache@v3
with:
path: target/
key: ${{ runner.os }}-cargo-build-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-build-${{ matrix.target }}-
${{ runner.os }}-cargo-build-

- name: Install linux dependencies
if: ${{ matrix.os == 'ubuntu-latest' }}
run: |
Expand All @@ -63,10 +87,6 @@ jobs:
brew install livekit
fi

- uses: actions/checkout@v3
with:
submodules: true

- name: Run LiveKit server
if: ${{ matrix.e2e-testing }}
run: livekit-server --dev &
Expand Down
11 changes: 11 additions & 0 deletions livekit/src/rtc_engine/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,17 @@ impl EngineInner {
match action {
proto::leave_request::Action::Resume
| proto::leave_request::Action::Reconnect => {
{
let running_handle = self.running_handle.read();

// server could have sent a leave & disconnected signal client
// we don't want to start another resume cycle
if !running_handle.can_reconnect {
return Ok(());
}
// ensure we release the lock from this scope, it'll be used again in reconnection_needed
}

log::warn!(
"received session close: {:?} {:?} {:?}",
source,
Expand Down