From 79c8081c307a611a4d90aa2a955c7260263be74e Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Fri, 29 Nov 2024 17:04:15 +0800 Subject: [PATCH] Update index.py --- plugins/redis/index.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/redis/index.py b/plugins/redis/index.py index 914bdcc16..a0c361030 100755 --- a/plugins/redis/index.py +++ b/plugins/redis/index.py @@ -224,7 +224,7 @@ def getPort(): conf = getServerDir() + '/redis.conf' content = mw.readFile(conf) - rep = r"^(" + r'port' + r')\s*([.0-9A-Za-z_& ~]+)' + rep = r"^(" + r'port' + r'\)\s*([.0-9A-Za-z_& ~]+)' tmp = re.search(rep, content, re.M) if tmp: return tmp.groups()[1] @@ -236,7 +236,7 @@ def getRedisCmd(): requirepass = "" conf = getServerDir() + '/redis.conf' content = mw.readFile(conf) - rep = r"^(requirepass" + r')\s*([.0-9A-Za-z_& ~]+)' + rep = r"^(requirepass" + r"\)\s*([.0-9A-Za-z_& ~]+)" tmp = re.search(rep, content, re.M) if tmp: requirepass = tmp.groups()[1] @@ -246,12 +246,10 @@ def getRedisCmd(): # findDebian = mw.execShell('cat /etc/issue |grep Debian') # if findDebian[0] != '': # default_ip = mw.getLocalIp() - cmd = getServerDir() + "/bin/redis-cli -h " + \ - default_ip + ' -p ' + port + " " + cmd = getServerDir() + "/bin/redis-cli -h " + default_ip + ' -p ' + port + " " if requirepass != "": - cmd = getServerDir() + '/bin/redis-cli -h ' + default_ip + \ - ' -p ' + port + ' -a "' + requirepass + '" ' + cmd = getServerDir() + '/bin/redis-cli -h ' + default_ip + ' -p ' + port + ' -a "' + requirepass + '" ' return cmd