Add build.rs to log git sha on init

oshadmi · oshadmi · commit 0c563c172c87 · 2021-11-08T00:00:14.000+02:00
diff --git a/Makefile b/Makefile
@@ -134,7 +134,6 @@ RUST_SOEXT.freebsd=so
 RUST_SOEXT.macos=dylib
 
 build:
-CARGO_FLAGS = cargo:rustc-env=GITHASH=$(git rev-parse HEAD); $(CARGO_FLAGS)
 ifeq ($(SAN),)
 	export RUSTFLAGS=$(RUSTFLAGS) ;\
 	cargo build --all --all-targets $(CARGO_FLAGS)
diff --git a/build.rs b/build.rs
@@ -0,0 +1,10 @@
+use std::process::Command;
+
+fn main() {
+    // Expose GIT_SHA env var
+    let gitsha = Command::new("git").args(&["rev-parse", "HEAD"]).output();
+    if let Ok(sha) = gitsha {
+        let sha = String::from_utf8(sha.stdout).unwrap();
+        println!("cargo:rustc-env=GIT_SHA={}", sha);
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
@@ -27,6 +27,8 @@ pub mod manager;
 mod nodevisitor;
 pub mod redisjson;
 
+pub const GIT_SHA: Option<&'static str> = std::option_env!("GIT_SHA");
+
 pub const REDIS_JSON_TYPE_VERSION: i32 = 3;
 
 pub static REDIS_JSON_TYPE: RedisType = RedisType::new(
@@ -400,10 +402,7 @@ macro_rules! redis_json_module_create {(
         }
 
         fn intialize(ctx: &Context, args: &Vec<RedisString>) -> Status {
-            ctx.log_notice(format!("git_sha={}",
-                option_env!("GITHASH")
-                .unwrap_or("unknown")
-            ));
+            ctx.log_notice(&format!("git sha: {}", match GIT_SHA { Some(sha) => sha, _ => "unknown"}));
             export_shared_api(ctx);
             ctx.set_module_options(ModuleOptions::HANDLE_IO_ERRORS);
             ctx.log_notice("Enabled diskless replication");
