Use vendored zmq

Also, don't use pyo3-log as it can deadlock - it needs the GIL...
LiberTEM · Aug 15, 2022 · 4baf08a · 4baf08a
1 parent 7abbdfd
commit 4baf08a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,6 +4,7 @@ authors = ["Alexander Clausen <a.clausen@fz-juelich.de>"]
 license = "MIT"
 version = "0.1.0"
 edition = "2021"
+readme = "README.md"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
@@ -26,7 +27,7 @@ pyo3-log = "0.6.0"
 serde = { version = "1.0.143", features = ["derive"] }
 serde_json = "1.0.83"
 spin_sleep = "1.1.1"
-zmq = "0.9.2"
+zmq = { version = "0.9.2", features = ["vendored"] }
 
 [profile.release]
 debug = true
diff --git a/src/dectris_py.rs b/src/dectris_py.rs
@@ -22,7 +22,9 @@ use zmq::{Message, Socket};
 
 #[pymodule]
 fn libertem_dectris(py: Python, m: &PyModule) -> PyResult<()> {
-    pyo3_log::init();
+    // FIXME: logging integration deadlocks on close(), when trying to acquire
+    // the GIL
+    // pyo3_log::init();
 
     m.add_class::<Frame>().unwrap();
     m.add_class::<FrameIterator>().unwrap();