feat: webhooks support ntfy

Cargo.toml

@@ -35,11 +35,7 @@ coverage = []
 color-eyre = "0.6.2"
 hex = "0.4.3"
 tracing = "0.1.40"
-tracing-subscriber = { version = "0.3.18", features = [
-    "env-filter",
-    "time",
-    "tracing-log",
-] }
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 http-body-util = "0.1.0"
 hyper = { version = "1.0.1", default-features = false }
 

integration-tests/README.md

@@ -9,14 +9,14 @@ Currently setup to a very basic exit 1 on invalid restart and exit 0 on valid re
 ## Run tests
 
 ```
-cd tests
+cd integration-tests
 ./tests.sh
 ```
 
 ## Run tests in CI
 
 ```
-cd tests
+cd integration-tests
 export "AUTOHEAL_CONTAINER_LABEL=autoheal-123456"
 ./tests.sh "MY_UNIQUE_BUILD_NUMBER_123456"
 ```

integration-tests/docker-compose.build.yml

@@ -4,3 +4,5 @@ services:
   autoheal:
     build:
       context: ../
+      args:
+        APPLICATION_NAME: "autoheal-rs"

integration-tests/docker-compose.yml

@@ -50,6 +50,7 @@ services:
     environment:
       AUTOHEAL_CONTAINER_LABEL: "${AUTOHEAL_CONTAINER_LABEL:-all}"
       AUTOHEAL_INTERVAL: "10"
+      # WEBHOOK_URL: https://ntfy.sh/...
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
-    network_mode: none
+    network_mode: host

integration-tests/watch-autoheal/Dockerfile

@@ -2,7 +2,6 @@ FROM alpine:latest@sha256:eece025e432126ce23f223450a0326fbebde39cdf496a85d8c0162
 
 RUN apk --update add bash docker
 
-
 RUN addgroup -S appgroup && adduser -S appuser -G appgroup
 USER appuser
 

integration-tests/watch-autoheal/entrypoint.sh

@@ -1,19 +1,17 @@
 #!/usr/bin/env bash
 set -euxo pipefail
 
-listenToDockerEvents()
-{
-  local expected_restarts
-  local LOGLINE
-  expected_restarts=0
-  docker events --filter 'com.docker.compose.service=should-keep-restarting' --filter 'com.docker.compose.service=shouldnt-restart-*' --filter 'event=restart' | while read -r LOGLINE
-  do
-    echo "$LOGLINE"
-    # may be more elaborate checks here.
-    [[ $LOGLINE == *"container restart "*"com.docker.compose.service=shouldnt-restart-"* && $LOGLINE == *"com.docker.compose.project=$COMPOSE_PROJECT_NAME"* ]] && echo "ERR: No restarts expected on shouldnt-restart-* containers!" 1>&2 && pkill -9 docker && exit 1
-    [[ $LOGLINE == *"container restart "*"com.docker.compose.service=should-keep-restarting"* && $LOGLINE == *"com.docker.compose.project=$COMPOSE_PROJECT_NAME"* ]] && echo "OK: Expected restart on should-keep-restarting container!" && pkill -9 docker && expected_restarts=$((expected_restarts + 1))
-    [[ $expected_restarts == 1 ]] && echo "OK: All expected restarts happened" && exit 0
-  done
+listenToDockerEvents() {
+    local expected_restarts
+    local LOGLINE
+    expected_restarts=0
+    docker events --filter 'com.docker.compose.service=should-keep-restarting' --filter 'com.docker.compose.service=shouldnt-restart-*' --filter 'event=restart' | while read -r LOGLINE; do
+        echo "$LOGLINE"
+        # may be more elaborate checks here.
+        [[ $LOGLINE == *"container restart "*"com.docker.compose.service=shouldnt-restart-"* && $LOGLINE == *"com.docker.compose.project=$COMPOSE_PROJECT_NAME"* ]] && echo "ERR: No restarts expected on shouldnt-restart-* containers!" 1>&2 && pkill -9 docker && exit 1
+        [[ $LOGLINE == *"container restart "*"com.docker.compose.service=should-keep-restarting"* && $LOGLINE == *"com.docker.compose.project=$COMPOSE_PROJECT_NAME"* ]] && echo "OK: Expected restart on should-keep-restarting container!" && pkill -9 docker && expected_restarts=$((expected_restarts + 1))
+        [[ $expected_restarts == 1 ]] && echo "OK: All expected restarts happened" && exit 0
+    done
 }
 
 export -f listenToDockerEvents

src/docker.rs

@@ -8,6 +8,7 @@ use hyper::{Method, Response, StatusCode};
 use hyper_tls::HttpsConnector;
 use hyper_unix_socket::UnixSocketConnector;
 use tokio::time::timeout;
+use tracing::{event, Level};
 
 use crate::app_config::AppConfig;
 use crate::container::Container;
@@ -102,11 +103,12 @@ impl Docker {
 
         match &container_info.names[..] {
             [] => {
-                tracing::error!("Container name of {} is null, which implies container does not exist - don't restart.", container_short_id);
+                event!(Level::ERROR, "Container name of {} is null, which implies container does not exist - don't restart.", container_short_id);
             },
             container_names => {
                 if container_info.state == "restarting" {
-                    tracing::info!(
+                    event!(
+                        Level::INFO,
                         "Container {} ({}) found to be restarting - don't restart.",
                         container_names.join(", "),
                         container_short_id
@@ -116,7 +118,7 @@ impl Docker {
                         .timeout
                         .unwrap_or(app_config.autoheal_default_stop_timeout);
 
-                    tracing::info!(
+                    event!(Level::INFO,
                         "Container {} ({}) found to be unhealthy - Restarting container now with {}s timeout.",
                         container_names.join(", "),
                         container_short_id, timeout
@@ -131,7 +133,7 @@ impl Docker {
                             );
                         },
                         Err(e) => {
-                            tracing::info!(
+                            event!(Level::INFO,
                                 error = ?e,
                                 "Restarting container {} ({}) failed.",
                                 container_names.join(", "),
@@ -140,9 +142,9 @@ impl Docker {
 
                             notify_webhook_failure(
                                 app_config,
-                                &container_names.join(", "),
-                                container_short_id,
-                                &e,
+                                container_names.join(", "),
+                                container_short_id.to_owned(),
+                                e,
                             );
                         },
                     }

src/env.rs

@@ -1,3 +1,5 @@
+use tracing::{event, Level};
+
 fn try_parse_env_variable<T>(env_variable_name: &str) -> Result<Option<T>, color_eyre::Report>
 where
     T: std::str::FromStr,
@@ -36,11 +38,11 @@ where
 {
     match try_parse_env_variable(env_variable_name) {
         Ok(Some(ct)) => {
-            tracing::info!("{} set to {:?}", env_variable_name, ct);
+            event!(Level::INFO, "{} set to {:?}", env_variable_name, ct);
             Ok(Some(ct))
         },
         Ok(None) => {
-            tracing::info!("{} not set", env_variable_name);
+            event!(Level::INFO, "{} not set", env_variable_name);
             Ok(None)
         },
         Err(e) => Err(e),
@@ -61,12 +63,17 @@ where
 {
     match try_parse_env_variable(env_variable_name) {
         Ok(Some(ct)) => {
-            tracing::info!("{} set to {:?}", env_variable_name, ct);
+            event!(Level::INFO, "{} set to {:?}", env_variable_name, ct);
             Ok(ct)
         },
 
         Ok(None) => {
-            tracing::info!("{} not set, defaulting to {:?}", env_variable_name, default);
+            event!(
+                Level::INFO,
+                "{} not set, defaulting to {:?}",
+                env_variable_name,
+                default
+            );
             Ok(default)
         },
         Err(e) => Err(e),

src/handlers.rs

@@ -9,11 +9,7 @@ use crate::wrap_and_report;
 
 #[no_mangle]
 pub extern "C" fn sig_handler(signal: i32) {
-    event!(
-        Level::INFO,
-        message = "Stopping the engine",
-        raw_signal = signal
-    );
+    event!(Level::INFO, raw_signal = signal, "Stopping the engine");
     // std::process::exit(128 + signal);
     std::process::exit(0);
     // RUNNING.store(false, Ordering::SeqCst);