From db956452d1a0f03690eacf949c8c018e5843e4fe Mon Sep 17 00:00:00 2001
From: Andrey Petelin <am.petelin@gmail.com>
Date: Sun, 14 Sep 2025 09:10:42 +0500
Subject: [PATCH] refactor: Move logging functions to library file

---
 podkop/files/usr/bin/podkop       | 28 +---------------------------
 podkop/files/usr/lib/constants.sh |  4 ----
 podkop/files/usr/lib/logging.sh   | 30 ++++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 31 deletions(-)
 create mode 100644 podkop/files/usr/lib/logging.sh

diff --git a/podkop/files/usr/bin/podkop b/podkop/files/usr/bin/podkop
index c9c5672..965bba0 100755
--- a/podkop/files/usr/bin/podkop
+++ b/podkop/files/usr/bin/podkop
@@ -8,36 +8,10 @@ PODKOP_LIB="/usr/lib/podkop"
 . "$PODKOP_LIB/helpers.sh"
 . "$PODKOP_LIB/sing_box_config_manager.sh"
 . "$PODKOP_LIB/sing_box_config_facade.sh"
+. "$PODKOP_LIB/logging.sh"
 
 config_load "$PODKOP_CONFIG"
 
-log() {
-    local message="$1"
-    local level="$2"
-
-    if [ "$level" == "" ]; then
-        level="info"
-    fi
-
-    logger -t "podkop" "[$level] $message"
-}
-
-nolog() {
-    local message="$1"
-    local timestamp
-    timestamp=$(date +"%Y-%m-%d %H:%M:%S")
-
-    echo -e "${COLOR_CYAN}[$timestamp]${COLOR_RESET} ${COLOR_GREEN}$message${COLOR_RESET}"
-}
-
-echolog() {
-    local message="$1"
-    local level="$2"
-
-    log "$message" "$level"
-    nolog "$message"
-}
-
 start_main() {
     log "Starting podkop"
 
diff --git a/podkop/files/usr/lib/constants.sh b/podkop/files/usr/lib/constants.sh
index d42aac2..eaa3572 100644
--- a/podkop/files/usr/lib/constants.sh
+++ b/podkop/files/usr/lib/constants.sh
@@ -9,10 +9,6 @@ FAKEIP_TEST_DOMAIN="fakeip.podkop.fyi"
 TMP_SING_BOX_FOLDER="/tmp/sing-box"
 TMP_RULESET_FOLDER="$TMP_SING_BOX_FOLDER/rulesets"
 CLOUDFLARE_OCTETS="8.47 162.159 188.114" # Endpoints https://github.com/ampetelin/warp-endpoint-checker
-# Color constants
-COLOR_CYAN="\033[0;36m"
-COLOR_GREEN="\033[0;32m"
-COLOR_RESET="\033[0m"
 
 ## nft
 NFT_TABLE_NAME="PodkopTable"
diff --git a/podkop/files/usr/lib/logging.sh b/podkop/files/usr/lib/logging.sh
new file mode 100644
index 0000000..6a3ad6c
--- /dev/null
+++ b/podkop/files/usr/lib/logging.sh
@@ -0,0 +1,30 @@
+COLOR_CYAN="\033[0;36m"
+COLOR_GREEN="\033[0;32m"
+COLOR_RESET="\033[0m"
+
+log() {
+    local message="$1"
+    local level="$2"
+
+    if [ "$level" == "" ]; then
+        level="info"
+    fi
+
+    logger -t "podkop" "[$level] $message"
+}
+
+nolog() {
+    local message="$1"
+    local timestamp
+    timestamp=$(date +"%Y-%m-%d %H:%M:%S")
+
+    echo -e "${COLOR_CYAN}[$timestamp]${COLOR_RESET} ${COLOR_GREEN}$message${COLOR_RESET}"
+}
+
+echolog() {
+    local message="$1"
+    local level="$2"
+
+    log "$message" "$level"
+    nolog "$message"
+}