Skip to content

Commit

Permalink
feat: provide healthcheck API
Browse files Browse the repository at this point in the history
  • Loading branch information
sigoden committed Oct 27, 2024
1 parent 881a67e commit a618fa3
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 3 deletions.
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,14 @@ dd skip=$upload_offset if=file status=none ibs=1 | \
curl -X PATCH -H "X-Update-Range: append" --data-binary @- http://127.0.0.1:5000/file
```

Health checks

```sh
curl http://127.0.0.1:5000/__dufs__/health
```

<details>
<summary><h2>Advanced topics</h2></summary>
<summary><h2>Advanced Topics</h2></summary>

### Access Control

Expand Down Expand Up @@ -395,6 +401,8 @@ Dufs allows users to customize the UI with your own assets.
dufs --assets my-assets-dir/
```

> If you only need to make slight adjustments to the current UI, you copy dufs's [assets](https://github.com/sigoden/dufs/tree/main/assets) directory and modify it accordingly. The current UI doesn't use any frameworks, just plain HTML/JS/CSS. As long as you have some basic knowledge of web development, it shouldn't be difficult to modify.
Your assets folder must contains a `index.html` file.

`index.html` can use the following placeholder variables to retrieve internal data.
Expand Down
11 changes: 9 additions & 2 deletions src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ const INDEX_NAME: &str = "index.html";
const BUF_SIZE: usize = 65536;
const EDITABLE_TEXT_MAX_SIZE: u64 = 4194304; // 4M
const RESUMABLE_UPLOAD_MIN_SIZE: u64 = 20971520; // 20M
const HEALTH_CHECK_PATH: &str = "__dufs__/health";

pub struct Server {
args: Args,
Expand Down Expand Up @@ -171,7 +172,7 @@ impl Server {

if method == Method::GET
&& self
.handle_assets(&relative_path, headers, &mut res)
.handle_internal(&relative_path, headers, &mut res)
.await?
{
return Ok(res);
Expand Down Expand Up @@ -738,7 +739,7 @@ impl Server {
Ok(())
}

async fn handle_assets(
async fn handle_internal(
&self,
req_path: &str,
headers: &HeaderMap<HeaderValue>,
Expand Down Expand Up @@ -789,6 +790,12 @@ impl Server {
HeaderValue::from_static("nosniff"),
);
Ok(true)
} else if req_path == HEALTH_CHECK_PATH {
res.headers_mut()
.typed_insert(ContentType::from(mime_guess::mime::APPLICATION_JSON));

*res.body_mut() = body_full(r#"{"status":"OK"}"#);
Ok(true)
} else {
Ok(false)
}
Expand Down
31 changes: 31 additions & 0 deletions tests/health.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
mod fixtures;
mod utils;

use fixtures::{server, Error, TestServer};
use rstest::rstest;

const HEALTH_CHECK_PATH: &str = "__dufs__/health";
const HEALTH_CHECK_RESPONSE: &str = r#"{"status":"OK"}"#;

#[rstest]
fn normal_health(server: TestServer) -> Result<(), Error> {
let resp = reqwest::blocking::get(format!("{}{HEALTH_CHECK_PATH}", server.url()))?;
assert_eq!(resp.text()?, HEALTH_CHECK_RESPONSE);
Ok(())
}

#[rstest]
fn auth_health(
#[with(&["--auth", "user:pass@/:rw", "-A"])] server: TestServer,
) -> Result<(), Error> {
let resp = reqwest::blocking::get(format!("{}{HEALTH_CHECK_PATH}", server.url()))?;
assert_eq!(resp.text()?, HEALTH_CHECK_RESPONSE);
Ok(())
}

#[rstest]
fn path_prefix_health(#[with(&["--path-prefix", "xyz"])] server: TestServer) -> Result<(), Error> {
let resp = reqwest::blocking::get(format!("{}xyz/{HEALTH_CHECK_PATH}", server.url()))?;
assert_eq!(resp.text()?, HEALTH_CHECK_RESPONSE);
Ok(())
}

0 comments on commit a618fa3

Please sign in to comment.