]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
manager: env var for API socket renamed
authorAleš Mrázek <ales.mrazek@nic.cz>
Tue, 19 Sep 2023 07:38:00 +0000 (09:38 +0200)
committerOto Šťáva <oto.stava@nic.cz>
Mon, 25 Sep 2023 10:58:17 +0000 (12:58 +0200)
manager/knot_resolver_manager/cli/command.py
manager/knot_resolver_manager/constants.py
manager/scripts/run

index 5f794e24c6bb7b6fc6484bbe94162bac452c4c9d..0b10a2f1d8660e2c4dac4b84baf122c354926373 100644 (file)
@@ -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)
index 31194ea353fd35979e415ffc297f67aef38f2390..b80774a9337e5af2eda0449104b61f645ebc02e2 100644 (file)
@@ -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"
index 4b96aa9a5e50711e1801c843a04579e4be568c3e..2080ce2a2776ea3e1df4b405f5fc0da1e3ea089f 100755 (executable)
@@ -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 $@