From 257b3bf77235e57f28249ed8bd51b8d525aa78e8 Mon Sep 17 00:00:00 2001
From: "bt.cn" <31841517+aaPanel@users.noreply.github.com>
Date: Wed, 1 Sep 2021 16:00:32 +0800
Subject: [PATCH] =?UTF-8?q?#=E5=88=A0=E9=99=A4=E6=89=80=E6=9C=89=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=9A=84=E6=97=A5=E5=BF=97=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=20del=5Fall=5Flog=5Fformat=20#=E4=BF=AE=E5=A4=8D=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=97=A5=E5=BF=97=E6=A0=BC=E5=BC=8F=E6=97=B6=E6=AD=A3?=
 =?UTF-8?q?=E5=88=99=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=20get=5F?=
 =?UTF-8?q?nginx=5Faccess=5Flog=5Fformat=5Fparameter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 class/apache.py | 15 ++++++++++++---
 class/nginx.py  | 18 ++++++++++++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/class/apache.py b/class/apache.py
index 7336f76a..2e67519b 100644
--- a/class/apache.py
+++ b/class/apache.py
@@ -257,6 +257,12 @@ class apache:
         public.serviceReload()
         return public.returnMsg(True, 'SET_SUCCESS')
 
+    def del_all_log_format(self,args):
+        all_format = self.get_httpd_access_log_format(args)
+        for i in all_format:
+            args.log_format_name = i
+            self.del_httpd_access_log_format(args)
+
     def _del_format_log_of_website(self,log_format_name):
         site_format_log_status = self._get_format_log_to_website(log_format_name)
         try:
@@ -314,15 +320,18 @@ class apache:
             if not conf:
                 return public.returnMsg(False, 'CONF_FILE_NOT_EXISTS')
             data = re.findall(reg,conf)
-            format_name = [i.split('_')[-1] for i in data]
+            format_name = [i.split('LOG_FORMAT_BEGIN_')[-1] for i in data]
             format_log = {}
             for i in format_name:
                 format_reg = "#LOG_FORMAT_BEGIN_{n}(\n|.)+LogFormat\s+\'(.*)\'\s+{n}".format(n=i)
-                tmp = re.search(format_reg,conf).groups()[1].split()
+                tmp = re.search(format_reg,conf)
+                if not tmp:
+                    continue
+                tmp = tmp.groups()[1].split()
                 format_log[i] = self._process_log_format(tmp)
             return format_log
         except:
-            return public.get_error_info()
+            return public.returnMsg(False,public.get_error_info())
 
     def set_httpd_format_log_to_website(self,args):
         '''
diff --git a/class/nginx.py b/class/nginx.py
index 47f88fb5..f5cf0122 100644
--- a/class/nginx.py
+++ b/class/nginx.py
@@ -166,16 +166,23 @@ class nginx:
         @author zhwen<zhw@bt.cn>
         @param log_format_name
         '''
+        log_format_name = args.log_format_name
         conf = public.readFile(self.nginxconf)
         if not conf:
             return public.returnMsg(False, 'NGINX_CONF_NOT_EXISTS')
         reg = '\s*#LOG_FORMAT_BEGIN_{n}(\n|.)+#LOG_FORMAT_END_{n}\n?'.format(n=args.log_format_name)
         conf = re.sub(reg,'',conf)
-        self._del_format_log_of_website(args.log_format_name)
+        self._del_format_log_of_website(log_format_name)
         public.writeFile(self.nginxconf,conf)
         public.serviceReload()
         return public.returnMsg(True, 'SET_SUCCESS')
 
+    def del_all_log_format(self,args):
+        all_format = self.get_nginx_access_log_format(args)
+        for i in all_format:
+            args.log_format_name = i
+            self.del_nginx_access_log_format(args)
+
     def get_nginx_access_log_format_parameter(self,args=None):
         data = {
             "$server_name":"Server Name",
@@ -218,15 +225,18 @@ class nginx:
             if not conf:
                 return public.returnMsg(False, 'NGINX_CONF_NOT_EXISTS')
             data = re.findall(reg,conf)
-            format_name = [i.split('_')[-1] for i in data]
+            format_name = [i.split('LOG_FORMAT_BEGIN_')[-1] for i in data]
             format_log = {}
             for i in format_name:
                 format_reg = "#LOG_FORMAT_BEGIN_{n}(\n|.)+log_format\s+{n}\s*(.*);".format(n=i)
-                tmp = re.search(format_reg,conf).groups()[1].split()
+                tmp = re.search(format_reg,conf)
+                if not tmp:
+                    continue
+                tmp = tmp.groups()[1].split()
                 format_log[i] = self._process_log_format(tmp)
             return format_log
         except:
-            return public.get_error_info()
+            return public.returnMsg(False,public.get_error_info())
 
     def set_format_log_to_website(self,args):
         '''