@smilintux/skcapstone 0.4.6 → 0.4.7

package/src/skcapstone/fuse_mount.py

@@ -31,6 +31,7 @@ import errno
 import json
 import logging
 import os
+import platform
 import stat
 import subprocess
 import sys
@@ -1001,16 +1002,17 @@ class FUSEDaemon:
         mount_str = str(self._mount_point)
 
         # Linux: parse /proc/mounts
-        proc_mounts = Path("/proc/mounts")
-        if proc_mounts.exists():
-            try:
-                for line in proc_mounts.read_text(encoding="utf-8").splitlines():
-                    parts = line.split()
-                    if len(parts) >= 2 and parts[1] == mount_str:
-                        return True
-            except OSError as exc:
-                logger.warning("Failed to read /proc/mounts: %s", exc)
-            return False
+        if platform.system() == "Linux":
+            proc_mounts = Path("/proc/mounts")
+            if proc_mounts.exists():
+                try:
+                    for line in proc_mounts.read_text(encoding="utf-8").splitlines():
+                        parts = line.split()
+                        if len(parts) >= 2 and parts[1] == mount_str:
+                            return True
+                except OSError as exc:
+                    logger.warning("Failed to read /proc/mounts: %s", exc)
+                return False
 
         # macOS / other: use mount command
         try:
@@ -1113,8 +1115,13 @@ class FUSEDaemon:
 
         mount_str = str(self._mount_point)
 
-        # Linux: fusermount
-        for cmd in (["fusermount", "-u", mount_str], ["umount", mount_str]):
+        # On Linux try fusermount first, then umount; on macOS skip fusermount
+        if platform.system() == "Linux":
+            unmount_cmds = [["fusermount", "-u", mount_str], ["umount", mount_str]]
+        else:
+            unmount_cmds = [["umount", mount_str]]
+
+        for cmd in unmount_cmds:
             try:
                 result = subprocess.run(cmd, capture_output=True, text=True, timeout=10)
                 if result.returncode == 0:
@@ -1130,7 +1137,8 @@ class FUSEDaemon:
             except (FileNotFoundError, subprocess.TimeoutExpired, OSError) as exc:
                 logger.debug("Unmount command %s failed: %s", cmd, exc)
 
-        logger.error("Could not unmount %s — try: fusermount -u %s", mount_str, mount_str)
+        hint = "fusermount -u" if platform.system() == "Linux" else "umount"
+        logger.error("Could not unmount %s — try: %s %s", mount_str, hint, mount_str)
         return False
 
     def status(self) -> Dict[str, Any]:

package/src/skcapstone/heartbeat.py

@@ -398,27 +398,30 @@ class HeartbeatBeacon:
             mem = psutil.virtual_memory()
             mem_used_mb = (mem.total - mem.available) // (1024 * 1024)
         except ImportError:
-            # Fallback: /proc on Linux
-            try:
-                loadavg = Path("/proc/loadavg")
-                if loadavg.exists():
-                    parts = loadavg.read_text().split()
-                    cpu_load = round(float(parts[0]), 2)
-            except Exception as exc:
-                logger.debug("CPU load fallback failed: %s", exc)
-            try:
-                meminfo = Path("/proc/meminfo")
-                if meminfo.exists():
-                    info: dict[str, int] = {}
-                    for line in meminfo.read_text().splitlines():
-                        parts = line.split()
-                        if len(parts) >= 2:
-                            info[parts[0].rstrip(":")] = int(parts[1])
-                    total_kb = info.get("MemTotal", 0)
-                    avail_kb = info.get("MemAvailable", 0)
-                    mem_used_mb = (total_kb - avail_kb) // 1024
-            except Exception as exc:
-                logger.debug("Memory fallback failed: %s", exc)
+            # Fallback: /proc on Linux only
+            if platform.system() == "Linux":
+                try:
+                    loadavg = Path("/proc/loadavg")
+                    if loadavg.exists():
+                        parts = loadavg.read_text().split()
+                        cpu_load = round(float(parts[0]), 2)
+                except Exception as exc:
+                    logger.debug("CPU load fallback failed: %s", exc)
+                try:
+                    meminfo = Path("/proc/meminfo")
+                    if meminfo.exists():
+                        info: dict[str, int] = {}
+                        for line in meminfo.read_text().splitlines():
+                            parts = line.split()
+                            if len(parts) >= 2:
+                                info[parts[0].rstrip(":")] = int(parts[1])
+                        total_kb = info.get("MemTotal", 0)
+                        avail_kb = info.get("MemAvailable", 0)
+                        mem_used_mb = (total_kb - avail_kb) // 1024
+                except Exception as exc:
+                    logger.debug("Memory fallback failed: %s", exc)
+            else:
+                logger.debug("psutil not available and not on Linux; skipping CPU/mem detection")
         except Exception as exc:
             logger.debug("CPU/mem detection failed: %s", exc)
 
@@ -439,14 +442,15 @@ class HeartbeatBeacon:
                 mem_total = mem.total // (1024 * 1024)
                 mem_avail = mem.available // (1024 * 1024)
             except ImportError:
-                # Fallback: read from /proc/meminfo on Linux
-                meminfo = Path("/proc/meminfo")
-                if meminfo.exists():
-                    for line in meminfo.read_text().splitlines():
-                        if line.startswith("MemTotal:"):
-                            mem_total = int(line.split()[1]) // 1024
-                        elif line.startswith("MemAvailable:"):
-                            mem_avail = int(line.split()[1]) // 1024
+                # Fallback: read from /proc/meminfo on Linux only
+                if platform.system() == "Linux":
+                    meminfo = Path("/proc/meminfo")
+                    if meminfo.exists():
+                        for line in meminfo.read_text().splitlines():
+                            if line.startswith("MemTotal:"):
+                                mem_total = int(line.split()[1]) // 1024
+                            elif line.startswith("MemAvailable:"):
+                                mem_avail = int(line.split()[1]) // 1024
 
             gpu_available = False
             gpu_name = ""