From: Aleš Mrázek <ales.mrazek@nic.cz>
Date: Tue, 19 Sep 2023 07:38:00 +0000 (+0200)
Subject: manager: env var for API socket renamed
X-Git-Tag: v6.0.3~1^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31c0968e17fbadca30ad1b24e7f1d283ed36c565;p=thirdparty%2Fknot-resolver.git

manager: env var for API socket renamed
---

diff --git a/manager/knot_resolver_manager/cli/command.py b/manager/knot_resolver_manager/cli/command.py
index 5f794e24c..0b10a2f1d 100644
--- a/manager/knot_resolver_manager/cli/command.py
+++ b/manager/knot_resolver_manager/cli/command.py
@@ -5,7 +5,7 @@ from pathlib import Path
 from typing import Dict, List, Optional, Tuple, Type, TypeVar
 from urllib.parse import quote
 
-from knot_resolver_manager.constants import CONFIG_FILE_ENV_VAR, DEFAULT_MANAGER_CONFIG_FILE, MANAGER_API_SOCK_ENV_VAR
+from knot_resolver_manager.constants import API_SOCK_ENV_VAR, CONFIG_FILE_ENV_VAR, DEFAULT_MANAGER_CONFIG_FILE
 from knot_resolver_manager.datamodel.config_schema import DEFAULT_MANAGER_API_SOCK
 from knot_resolver_manager.datamodel.types import FilePath, IPAddressPort
 from knot_resolver_manager.utils.modeling import parsing
@@ -64,7 +64,7 @@ def determine_socket(namespace: argparse.Namespace) -> str:
         return namespace.socket[0]
 
     config_path = os.getenv(CONFIG_FILE_ENV_VAR)
-    socket_env = os.getenv(MANAGER_API_SOCK_ENV_VAR)
+    socket_env = os.getenv(API_SOCK_ENV_VAR)
 
     socket: Optional[str] = None
     # 2) socket from config file ('kresctl --config' argument)
diff --git a/manager/knot_resolver_manager/constants.py b/manager/knot_resolver_manager/constants.py
index 31194ea35..b80774a93 100644
--- a/manager/knot_resolver_manager/constants.py
+++ b/manager/knot_resolver_manager/constants.py
@@ -12,7 +12,7 @@ if TYPE_CHECKING:
 STARTUP_LOG_LEVEL = logging.DEBUG
 DEFAULT_MANAGER_CONFIG_FILE = Path("/etc/knot-resolver/config.yaml")
 CONFIG_FILE_ENV_VAR = "KRES_MANAGER_CONFIG"
-MANAGER_API_SOCK_ENV_VAR = "MANAGER_API_SOCK"
+API_SOCK_ENV_VAR = "KRES_MANAGER_API_SOCK"
 MANAGER_FIX_ATTEMPT_MAX_COUNTER = 2
 FIX_COUNTER_DECREASE_INTERVAL_SEC = 30 * 60
 PID_FILE_NAME = "manager.pid"
diff --git a/manager/scripts/run b/manager/scripts/run
index 4b96aa9a5..2080ce2a2 100755
--- a/manager/scripts/run
+++ b/manager/scripts/run
@@ -35,10 +35,10 @@ if [ -z "${KRES_MANAGER_CONFIG:-}" ]; then
     KRES_MANAGER_CONFIG="$KRES_MANAGER_RUNTIME/config.dev.yaml"
 fi
 
-if [ -z "${MANAGER_API_SOCK:-}" ]; then
-    MANAGER_API_SOCK="$KRES_MANAGER_RUNTIME/manager.sock"
+if [ -z "${KRES_MANAGER_API_SOCK:-}" ]; then
+    KRES_MANAGER_API_SOCK="$KRES_MANAGER_RUNTIME/manager.sock"
 fi
 
 export KRES_MANAGER_CONFIG
-export MANAGER_API_SOCK
+export KRES_MANAGER_API_SOCK
 python3 -m knot_resolver_manager $@