diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-08-29 16:44:13 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-08-29 16:44:13 +0200 |
| commit | ebc20a879812dda6ab240a134a67b4675e24c435 (patch) | |
| tree | 62cff73a1d92b5ab3c7d0526bdd854e6b403ea6d /src/util | |
| parent | 16f6a1a65d4b973ea13cd00bbfdd7e225041e447 (diff) | |
| parent | 532eca7ff94e4710283fb38951a349a83654de59 (diff) | |
| download | garage-ebc20a879812dda6ab240a134a67b4675e24c435.tar.gz garage-ebc20a879812dda6ab240a134a67b4675e24c435.zip | |
Merge branch 'main' into lx-perf-improvements
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/util/lib.rs | 1 | ||||
| -rw-r--r-- | src/util/version.rs | 7 |
3 files changed, 10 insertions, 0 deletions
diff --git a/src/util/Cargo.toml b/src/util/Cargo.toml index 7d79f21a..9f7f8a4e 100644 --- a/src/util/Cargo.toml +++ b/src/util/Cargo.toml @@ -26,6 +26,7 @@ hex = "0.4" tracing = "0.1.30" rand = "0.8" sha2 = "0.10" +git-version = "0.3.4" chrono = "0.4" rmp-serde = "0.15" @@ -45,5 +46,6 @@ hyper = "0.14" opentelemetry = { version = "0.17", features = [ "rt-tokio", "metrics", "trace" ] } + [features] k2v = [] diff --git a/src/util/lib.rs b/src/util/lib.rs index 7152f92a..264cc192 100644 --- a/src/util/lib.rs +++ b/src/util/lib.rs @@ -15,3 +15,4 @@ pub mod persister; pub mod time; pub mod token_bucket; pub mod tranquilizer; +pub mod version; diff --git a/src/util/version.rs b/src/util/version.rs new file mode 100644 index 00000000..8882d035 --- /dev/null +++ b/src/util/version.rs @@ -0,0 +1,7 @@ +pub fn garage() -> &'static str { + option_env!("GIT_VERSION").unwrap_or(git_version::git_version!( + prefix = "git:", + cargo_prefix = "cargo:", + fallback = "unknown" + )) +} |