Add Rust-based monitoring tools with Python fallback

hecko · hecko · commit 5084930800ba · 2026-03-03T14:41:15.000+01:00
Introduce Rust implementations of sems-list-calls,
sems-list-active-calls, sems-list-finished-calls, and
sems-get-callproperties alongside the existing Python scripts.

When cargo/rustc &gt;= 1.38 is available, native binaries are built and
installed. Otherwise, shell wrapper scripts delegate to the Python
versions, keeping backwards compatibility fully intact.

All tools accept --url to override the default XMLRPC endpoint.
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,7 @@ sems
 sems_tests
 sems-logfile-callextract
 sems-stats
+apps/monitoring/tools/target/
+apps/monitoring/tools/vendor/
+apps/monitoring/tools/.cargo/
+apps/monitoring/tools/Cargo.lock
diff --git a/Dockerfile-debian11 b/Dockerfile-debian11
@@ -6,7 +6,8 @@ RUN apt install -y \
          libspeex-dev libgsm1-dev libopus-dev libssl-dev python3-dev \
          python3.9-dev libev-dev \
          python3-sip-dev openssl libev-dev libmysqlcppconn-dev libevent-dev \
-         libxml2-dev libcurl4-openssl-dev libhiredis-dev
+         libxml2-dev libcurl4-openssl-dev libhiredis-dev \
+         cargo rustc
 
 RUN apt install -y \
          devscripts libbcg729-dev \
diff --git a/Dockerfile-debian12 b/Dockerfile-debian12
@@ -8,7 +8,8 @@ RUN apt install -y \
          python3-sip-dev openssl libev-dev libmysqlcppconn-dev libevent-dev \
          libxml2-dev libcurl4-openssl-dev libhiredis-dev \
 	 libsamplerate-dev libmp3lame-dev libcodec2-dev \
-	 cmake dh-cmake dh-cmake-compat dh-sequence-cmake
+	 cmake dh-cmake dh-cmake-compat dh-sequence-cmake \
+	 cargo rustc
 
 
 RUN apt install -y \
diff --git a/Dockerfile-debian13 b/Dockerfile-debian13
@@ -11,7 +11,8 @@ RUN apt install -y \
          libxml2-dev libcurl4-openssl-dev libhiredis-dev
 
 RUN apt install -y devscripts libbcg729-dev \
-         libsamplerate-dev libmp3lame-dev libcodec2-dev
+         libsamplerate-dev libmp3lame-dev libcodec2-dev \
+         cargo rustc
 RUN pip install sip --break-system-packages
 COPY . /sems
 WORKDIR /sems
diff --git a/Dockerfile-rhel10 b/Dockerfile-rhel10
@@ -30,6 +30,7 @@ RUN dnf install -y epel-release \
         rpm-build \
         mysql-connector-c++ \
         which \
+        cargo rust \
         python3-mysqlclient --nogpgcheck
 
 WORKDIR /
diff --git a/Dockerfile-rhel8 b/Dockerfile-rhel8
@@ -26,6 +26,7 @@ RUN yum install -y \
         bcg729-devel codec2-devel flite-devel \
         lame-devel libmpg123-devel libsamplerate-devel \
         mysql-connector-c++-devel which man \
+        cargo rust \
         python3-mysqlclient --nogpgcheck
 
 RUN ln -s /usr/lib64/libpython3.6m.so /usr/lib64/libpython3.6.so
diff --git a/Dockerfile-rhel9 b/Dockerfile-rhel9
@@ -31,6 +31,7 @@ RUN yum install -y epel-release \
         rpm-build \
         mysql-connector-c++ \
         which \
+        cargo rust \
         python3-mysqlclient --nogpgcheck
 
 WORKDIR /
diff --git a/apps/monitoring/CMakeLists.txt b/apps/monitoring/CMakeLists.txt
@@ -5,5 +5,72 @@ install(
            tools/sems_list_calls.py tools/sems_list_finished_calls.py
   DESTINATION ${SEMS_EXEC_PREFIX}/sbin)
 
+# Rust-based monitoring tools (require rustc >= 1.38 for edition 2018)
+find_program(CARGO cargo)
+set(SEMS_RUST_OK FALSE)
+if(CARGO)
+  execute_process(
+    COMMAND rustc --version
+    OUTPUT_VARIABLE RUSTC_VERSION_OUTPUT
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    RESULT_VARIABLE RUSTC_RESULT)
+  if(RUSTC_RESULT EQUAL 0)
+    string(REGEX MATCH "[0-9]+\\.[0-9]+" RUSTC_VERSION "${RUSTC_VERSION_OUTPUT}")
+    if(RUSTC_VERSION VERSION_GREATER_EQUAL "1.38")
+      set(SEMS_RUST_OK TRUE)
+      message(STATUS "Found cargo: ${CARGO}, rustc ${RUSTC_VERSION}")
+    else()
+      message(WARNING "rustc ${RUSTC_VERSION} found but >= 1.38 required; skipping Rust monitoring tools")
+    endif()
+  endif()
+endif()
+
+if(SEMS_RUST_OK)
+  set(SEMS_MONITORING_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tools)
+
+  if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(CARGO_PROFILE "debug")
+    set(CARGO_RELEASE_FLAG "")
+  else()
+    set(CARGO_PROFILE "release")
+    set(CARGO_RELEASE_FLAG "--release")
+  endif()
+
+  set(SEMS_MONITORING_BINARIES
+    sems-list-calls
+    sems-list-active-calls
+    sems-list-finished-calls
+    sems-get-callproperties)
+
+  add_custom_target(sems-monitoring-tools ALL
+    COMMAND ${CARGO} build ${CARGO_RELEASE_FLAG}
+            --manifest-path ${SEMS_MONITORING_DIR}/Cargo.toml
+    COMMENT "Building sems monitoring tools (Rust)")
+
+  foreach(bin ${SEMS_MONITORING_BINARIES})
+    install(PROGRAMS ${SEMS_MONITORING_DIR}/target/${CARGO_PROFILE}/${bin}
+            DESTINATION ${SEMS_EXEC_PREFIX}/sbin)
+  endforeach()
+else()
+  message(WARNING "cargo/rustc not found or too old; installing Python wrapper scripts for monitoring tools")
+
+  set(MONITORING_FALLBACKS
+    "sems-list-calls:sems_list_calls.py"
+    "sems-list-active-calls:sems_list_active_calls.py"
+    "sems-list-finished-calls:sems_list_finished_calls.py"
+    "sems-get-callproperties:sems_get_callproperties.py")
+
+  foreach(entry ${MONITORING_FALLBACKS})
+    string(REPLACE ":" ";" parts ${entry})
+    list(GET parts 0 bin_name)
+    list(GET parts 1 py_name)
+    set(wrapper_path "${CMAKE_CURRENT_BINARY_DIR}/${bin_name}")
+    file(WRITE ${wrapper_path}
+      "#!/bin/sh\nexec \"$(dirname \"$0\")/${py_name}\" \"$@\"\n")
+    install(PROGRAMS ${wrapper_path}
+            DESTINATION ${SEMS_EXEC_PREFIX}/sbin)
+  endforeach()
+endif()
+
 set(sems_module_name monitoring)
 include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
diff --git a/apps/monitoring/tools/Cargo.toml b/apps/monitoring/tools/Cargo.toml
@@ -0,0 +1,8 @@
+[workspace]
+members = [
+    "sems-monitoring-lib",
+    "sems-list-calls",
+    "sems-list-active-calls",
+    "sems-list-finished-calls",
+    "sems-get-callproperties",
+]
diff --git a/apps/monitoring/tools/sems-get-callproperties/Cargo.toml b/apps/monitoring/tools/sems-get-callproperties/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "sems-get-callproperties"
+version = "0.1.0"
+edition = "2018"
+
+[dependencies]
+sems-monitoring-lib = { path = "../sems-monitoring-lib" }
diff --git a/apps/monitoring/tools/sems-get-callproperties/src/main.rs b/apps/monitoring/tools/sems-get-callproperties/src/main.rs
@@ -0,0 +1,34 @@
+use sems_monitoring_lib::{calls, di, parse_url_arg, pprint};
+use std::env;
+use std::process;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+    let (url, rest) = parse_url_arg(&args);
+
+    if rest.len() != 1 || rest[0] == "--help" {
+        eprintln!("usage: {} [--url <url>] <ltag/ID of call to list>", args[0]);
+        process::exit(1);
+    }
+
+    let callid = &rest[0];
+
+    let count = match calls(&url) {
+        Ok(n) => n,
+        Err(e) => {
+            eprintln!("Error calling calls(): {}", e);
+            process::exit(1);
+        }
+    };
+    println!("Active calls: {}", count);
+
+    let result = match di(&url, &["monitoring", "get", callid]) {
+        Ok(v) => v,
+        Err(e) => {
+            eprintln!("Error calling di(monitoring, get, {}): {}", callid, e);
+            process::exit(1);
+        }
+    };
+
+    println!("{}", pprint(&result));
+}
diff --git a/apps/monitoring/tools/sems-list-active-calls/Cargo.toml b/apps/monitoring/tools/sems-list-active-calls/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "sems-list-active-calls"
+version = "0.1.0"
+edition = "2018"
+
+[dependencies]
+sems-monitoring-lib = { path = "../sems-monitoring-lib" }
diff --git a/apps/monitoring/tools/sems-list-active-calls/src/main.rs b/apps/monitoring/tools/sems-list-active-calls/src/main.rs
@@ -0,0 +1,47 @@
+use sems_monitoring_lib::{calls, di, parse_url_arg, pprint, value_as_string_vec};
+use std::env;
+use std::process;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+    let (url, rest) = parse_url_arg(&args);
+
+    if rest.len() == 1 && rest[0] == "--help" {
+        eprintln!("usage: {} [--full] [--url <url>]", args[0]);
+        process::exit(1);
+    }
+
+    let count = match calls(&url) {
+        Ok(n) => n,
+        Err(e) => {
+            eprintln!("Error calling calls(): {}", e);
+            process::exit(1);
+        }
+    };
+    println!("Active calls: {}", count);
+
+    let ids_value = match di(&url, &["monitoring", "listActive"]) {
+        Ok(v) => v,
+        Err(e) => {
+            eprintln!("Error calling di(monitoring, listActive): {}", e);
+            process::exit(1);
+        }
+    };
+
+    println!("{}", pprint(&ids_value));
+
+    if rest.len() == 1 && rest[0] == "--full" {
+        let ids = value_as_string_vec(&ids_value);
+        for callid in &ids {
+            let attrs = match di(&url, &["monitoring", "get", callid]) {
+                Ok(v) => v,
+                Err(e) => {
+                    eprintln!("Error calling di(monitoring, get, {}): {}", callid, e);
+                    continue;
+                }
+            };
+            println!("----- {} -----", callid);
+            println!("{}", pprint(&attrs));
+        }
+    }
+}
diff --git a/apps/monitoring/tools/sems-list-calls/Cargo.toml b/apps/monitoring/tools/sems-list-calls/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "sems-list-calls"
+version = "0.1.0"
+edition = "2018"
+
+[dependencies]
+sems-monitoring-lib = { path = "../sems-monitoring-lib" }
diff --git a/apps/monitoring/tools/sems-list-calls/src/main.rs b/apps/monitoring/tools/sems-list-calls/src/main.rs
@@ -0,0 +1,47 @@
+use sems_monitoring_lib::{calls, di, parse_url_arg, pprint, value_as_string_vec};
+use std::env;
+use std::process;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+    let (url, rest) = parse_url_arg(&args);
+
+    if rest.len() == 1 && rest[0] == "--help" {
+        eprintln!("usage: {} [--full] [--url <url>]", args[0]);
+        process::exit(1);
+    }
+
+    let count = match calls(&url) {
+        Ok(n) => n,
+        Err(e) => {
+            eprintln!("Error calling calls(): {}", e);
+            process::exit(1);
+        }
+    };
+    println!("Active calls: {}", count);
+
+    let ids_value = match di(&url, &["monitoring", "list"]) {
+        Ok(v) => v,
+        Err(e) => {
+            eprintln!("Error calling di(monitoring, list): {}", e);
+            process::exit(1);
+        }
+    };
+
+    println!("{}", pprint(&ids_value));
+
+    if rest.len() == 1 && rest[0] == "--full" {
+        let ids = value_as_string_vec(&ids_value);
+        for callid in &ids {
+            let attrs = match di(&url, &["monitoring", "get", callid]) {
+                Ok(v) => v,
+                Err(e) => {
+                    eprintln!("Error calling di(monitoring, get, {}): {}", callid, e);
+                    continue;
+                }
+            };
+            println!("----- {} -----", callid);
+            println!("{}", pprint(&attrs));
+        }
+    }
+}
diff --git a/apps/monitoring/tools/sems-list-finished-calls/Cargo.toml b/apps/monitoring/tools/sems-list-finished-calls/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "sems-list-finished-calls"
+version = "0.1.0"
+edition = "2018"
+
+[dependencies]
+sems-monitoring-lib = { path = "../sems-monitoring-lib" }
diff --git a/apps/monitoring/tools/sems-list-finished-calls/src/main.rs b/apps/monitoring/tools/sems-list-finished-calls/src/main.rs
@@ -0,0 +1,32 @@
+use sems_monitoring_lib::{calls, di, parse_url_arg, pprint};
+use std::env;
+use std::process;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+    let (url, rest) = parse_url_arg(&args);
+
+    if rest.len() == 1 && rest[0] == "--help" {
+        eprintln!("usage: {} [--url <url>]", args[0]);
+        process::exit(1);
+    }
+
+    let count = match calls(&url) {
+        Ok(n) => n,
+        Err(e) => {
+            eprintln!("Error calling calls(): {}", e);
+            process::exit(1);
+        }
+    };
+    println!("Active calls: {}", count);
+
+    let result = match di(&url, &["monitoring", "listFinished"]) {
+        Ok(v) => v,
+        Err(e) => {
+            eprintln!("Error calling di(monitoring, listFinished): {}", e);
+            process::exit(1);
+        }
+    };
+
+    println!("{}", pprint(&result));
+}
diff --git a/apps/monitoring/tools/sems-monitoring-lib/Cargo.toml b/apps/monitoring/tools/sems-monitoring-lib/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "sems-monitoring-lib"
+version = "0.1.0"
+edition = "2018"
+
+[dependencies]
+xmlrpc = { version = "0.15", default-features = false }
+# Pin transitive deps to versions compatible with Rust 1.48 (Debian 11)
+xml-rs = ">= 0.8, < 0.8.6"
+memchr = ">= 2.3, < 2.6"
diff --git a/apps/monitoring/tools/sems-monitoring-lib/src/lib.rs b/apps/monitoring/tools/sems-monitoring-lib/src/lib.rs
diff --git a/apps/monitoring/tools/sems-monitoring-lib/tests/cli_tests.rs b/apps/monitoring/tools/sems-monitoring-lib/tests/cli_tests.rs
diff --git a/pkg/rpm/sems.spec b/pkg/rpm/sems.spec
