From dc8078fe4cb96da6a12eded6e47303f07f2eb385 Mon Sep 17 00:00:00 2001
From: Goffi <goffi@goffi.org>
Date: Sun, 14 Jan 2024 17:48:02 +0100
Subject: [PATCH] core: use a user specific directory for PID file:

default location of pid file is now specific to logged user, this allow to run several
instances of Libervia by different users on the same machine without PID conflicts.
---
 libervia/backend/core/constants.py | 14 ++++++++++----
 libervia/backend/core/launcher.py  |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/libervia/backend/core/constants.py b/libervia/backend/core/constants.py
index b45c71c5..5e1e9e7d 100644
--- a/libervia/backend/core/constants.py
+++ b/libervia/backend/core/constants.py
@@ -21,12 +21,19 @@ try:
     from os.path import expanduser, realpath
 except ImportError:
     BaseDirectory = None
-from os.path import dirname
+from os.path import dirname, join
 import tempfile
 from typing import Final
 
 from libervia import backend
 
+try:
+    from getpass import getuser
+except ImportError:
+    logged_user = "unkonwn"
+else:
+    logged_user = getuser()
+
 
 class Const(object):
 
@@ -458,7 +465,6 @@ class Const(object):
         return cls.BOOL_TRUE if value else cls.BOOL_FALSE
 
 
-
 ## Configuration ##
 if (
     BaseDirectory
@@ -489,7 +495,7 @@ if (
                 ).getAbsolutePath(),
                 Const.APP_NAME_FILE,
             ),
-            "pid_dir": tempfile.gettempdir(),
+            "pid_dir": join(tempfile.gettempdir(), Const.APP_NAME_FILE, logged_user),
             "log_dir": "%(local_dir)s",
         }
         Const.CONFIG_FILES = [
@@ -532,7 +538,7 @@ if (
             "media_dir": "/usr/share/" + Const.APP_NAME_FILE + "/media",
             "local_dir": BaseDirectory.save_data_path(Const.APP_NAME_FILE),
             "downloads_dir": "~/Downloads/" + Const.APP_NAME_FILE,
-            "pid_dir": tempfile.gettempdir(),
+            "pid_dir": join(tempfile.gettempdir(), Const.APP_NAME_FILE, logged_user),
             "log_dir": "%(local_dir)s",
         }
 
diff --git a/libervia/backend/core/launcher.py b/libervia/backend/core/launcher.py
index 9ea4f982..22de51c2 100644
--- a/libervia/backend/core/launcher.py
+++ b/libervia/backend/core/launcher.py
@@ -197,6 +197,7 @@ class Launcher:
 
     def get_pid_file(self, config):
         pid_dir = Path(config.get("DEFAULT", "pid_dir")).expanduser()
+        pid_dir.mkdir(parents=True, exist_ok=True)
         return pid_dir / f"{self.APP_NAME_FILE}.pid"
 
     def wait_for_service(