Skip to content

Commit 3df358a

Browse files
committed
Apply changes and deconflicts while #366 was pending.
Signed-off-by: Jason Volk <jason@zemos.net>
1 parent 7e5e668 commit 3df358a

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/service/replication/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ impl crate::Service for Service {
9999
}
100100

101101
loop {
102-
if !self.server.running() {
102+
if !self.server.is_running() {
103103
return Ok(());
104104
}
105105

@@ -146,7 +146,7 @@ impl crate::Service for Service {
146146

147147
let mut backoff_ms = BACKOFF_MIN_MS;
148148

149-
while self.server.running() && !self.promoted.load(Ordering::Acquire) {
149+
while self.server.is_running() && !self.promoted.load(Ordering::Acquire) {
150150
match self.run_stream(&primary_url).await {
151151
| Ok(()) => {
152152
// run_stream returns Ok on clean shutdown or promotion.
@@ -259,7 +259,7 @@ impl Service {
259259
let mut byte_stream = resp.bytes_stream();
260260
let mut buf: Vec<u8> = Vec::new();
261261

262-
while self.server.running() && !self.promoted.load(Ordering::Acquire) {
262+
while self.server.is_running() && !self.promoted.load(Ordering::Acquire) {
263263
tokio::select! {
264264
chunk = byte_stream.next() => {
265265
let Some(chunk) = chunk else {

0 commit comments

Comments
 (0)