Skip to content

Commit 8a35e0d

Browse files
committed
Merge branch 'main' into sse-changes
2 parents f44214a + 25a04d8 commit 8a35e0d

File tree

5 files changed

+18
-6
lines changed

5 files changed

+18
-6
lines changed

.github/workflows/build-push-edge-debug.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313
jobs:
1414
docker:
15-
runs-on: ubuntu-latest
15+
runs-on: self-hosted
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v3
@@ -36,6 +36,9 @@ jobs:
3636
uses: docker/metadata-action@v5
3737
with:
3838
images: parseable/parseable
39+
40+
- name: Clean up builder cache
41+
run: docker builder prune -f
3942

4043
- name: Build and push
4144
uses: docker/build-push-action@v6

.github/workflows/build-push-edge-kafka.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313
jobs:
1414
docker:
15-
runs-on: ubuntu-latest
15+
runs-on: self-hosted
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v4
@@ -58,3 +58,6 @@ jobs:
5858
platforms: linux/arm64
5959
build-args: |
6060
LIB_DIR=aarch64-linux-gnu
61+
62+
- name: Clean up builder cache
63+
run: docker builder prune -f

.github/workflows/build-push-edge.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313
jobs:
1414
docker:
15-
runs-on: ubuntu-latest
15+
runs-on: self-hosted
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v3
@@ -36,6 +36,9 @@ jobs:
3636
uses: docker/metadata-action@v5
3737
with:
3838
images: parseable/parseable
39+
40+
- name: Clean up builder cache
41+
run: docker builder prune -f
3942

4043
- name: Build and push
4144
uses: docker/build-push-action@v6

.github/workflows/release.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ jobs:
348348
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
349349

350350
build-push-docker-image:
351-
runs-on: ubuntu-latest
351+
runs-on: self-hosted
352352
steps:
353353
- name: Checkout
354354
uses: actions/checkout@v3
@@ -403,3 +403,6 @@ jobs:
403403
platforms: linux/arm64
404404
build-args: |
405405
LIB_DIR=aarch64-linux-gnu
406+
407+
- name: Clean up builder cache
408+
run: docker builder prune -f

src/alerts/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ impl AlertConfig {
607607

608608
pub async fn trigger_notifications(&self, message: String) -> Result<(), AlertError> {
609609
let mut context = self.get_context();
610-
context.message = message.clone();
610+
context.message.clone_from(&message);
611611

612612
for target_id in &self.targets {
613613
let target = TARGETS.get_target_by_id(target_id).await?;
@@ -619,7 +619,7 @@ impl AlertConfig {
619619
let active_sessions = sessions().get_active_sessions();
620620
let mut broadcast_to = vec![];
621621
for session in active_sessions {
622-
if let Ok(_) = user_auth_for_query(&session, &self.query).await
622+
if user_auth_for_query(&session, &self.query).await.is_ok()
623623
&& let SessionKey::SessionId(id) = &session
624624
{
625625
broadcast_to.push(*id);

0 commit comments

Comments
 (0)