update to 6.8.27

class/apache.py

@@ -43,7 +43,7 @@ class apache:
         try:
             workermen = int(public.ExecShell("ps aux|grep httpd|grep 'start'|awk '{memsum+=$6};END {print memsum}'")[0]) / 1024
         except:
-            return public.returnMsg(False,"Get worker RAM False")
+            return public.return_msg_gettext(False,"Get worker RAM False")
         for proc in psutil.process_iter():
             if proc.name() == "httpd":
                 self.GetProcessCpuPercent(proc.pid,process_cpu)
@@ -54,7 +54,7 @@ class apache:
         # 计算启动时间
         Uptime = re.search("ServerUptimeSeconds:\s+(.*)",result)
         if not Uptime:
-            return public.returnMsg(False, "Get worker Uptime False")
+            return public.return_msg_gettext(False, "Get worker Uptime False")
         Uptime = int(Uptime.group(1))
         min = Uptime / 60
         hours = min / 60
@@ -65,16 +65,16 @@ class apache:
         #格式化重启时间
         restarttime = re.search("RestartTime:\s+(.*)",result)
         if not restarttime:
-            return public.returnMsg(False, "Get worker Restart Time False")
+            return public.return_msg_gettext(False, "Get worker Restart Time False")
         restarttime = restarttime.group(1)
         rep = "\w+,\s([\w-]+)\s([\d\:]+)\s\w+"
         date = re.search(rep,restarttime)
         if not date:
-            return public.returnMsg(False, "Get worker date False")
+            return public.return_msg_gettext(False, "Get worker date False")
         date = date.group(1)
         timedetail = re.search(rep,restarttime)
         if not timedetail:
-            return public.returnMsg(False, "Get worker time detail False")
+            return public.return_msg_gettext(False, "Get worker time detail False")
         timedetail=timedetail.group(2)
         monthen = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]
         n = 0
@@ -87,7 +87,7 @@ class apache:
 
         reqpersec = re.search("ReqPerSec:\s+(.*)", result)
         if not reqpersec:
-            return public.returnMsg(False, "Get worker reqpersec False")
+            return public.return_msg_gettext(False, "Get worker reqpersec False")
         reqpersec = reqpersec.group(1)
         if re.match("^\.", reqpersec):
             reqpersec = "%s%s" % (0,reqpersec)
@@ -95,20 +95,20 @@ class apache:
         data["UpTime"] = "%s day %s hour %s minute" % (str(int(days)),str(int(hours)),str(int(min)))
         total_acc = re.search("Total Accesses:\s+(\d+)",result)
         if not total_acc:
-            return public.returnMsg(False, "Get worker TotalAccesses False")
+            return public.return_msg_gettext(False, "Get worker TotalAccesses False")
         data["TotalAccesses"] = total_acc.group(1)
         total_kb = re.search("Total kBytes:\s+(\d+)",result)
         if not total_kb:
-            return public.returnMsg(False, "Get worker TotalKBytes False")
+            return public.return_msg_gettext(False, "Get worker TotalKBytes False")
         data["TotalKBytes"] = total_kb.group(1)
         data["ReqPerSec"] = round(float(reqpersec), 2)
         busywork = re.search("BusyWorkers:\s+(\d+)",result)
         if not busywork:
-            return public.returnMsg(False, "Get worker BusyWorkers False")
+            return public.return_msg_gettext(False, "Get worker BusyWorkers False")
         data["BusyWorkers"] = busywork.group(1)
         idlework = re.search("IdleWorkers:\s+(\d+)",result)
         if not idlework:
-            return public.returnMsg(False, "Get worker IdleWorkers False")
+            return public.return_msg_gettext(False, "Get worker IdleWorkers False")
         data["IdleWorkers"] = idlework.group(1)
         data["workercpu"] = round(float(process_cpu["httpd"]),2)
         data["workermem"] = "%s%s" % (int(workermen),"MB")
@@ -120,10 +120,10 @@ class apache:
         if not "mpm_event_module" in apachempmcontent:
             return public.returnMsg(False,"mpm_event_module conf not found or /www/server/apache/conf/extra/httpd-mpm.conf is empty")
         apachempmcontent = re.search("\<IfModule mpm_event_module\>(\n|.)+?\</IfModule\>",apachempmcontent).group()
-        ps = ["%s，%s" % (public.GetMsg("SECOND"),public.GetMsg("REQUEST_TIMEOUT_TIME")),
-              public.GetMsg("KEEP_ALIVE"),
-              "%s，%s" % (public.GetMsg("SECOND"),public.GetMsg("CONNECT_TIMEOUT_TIME")),
-              public.GetMsg("MAX_KEEP_ALIVE_REQUESTS")]
+        ps = ["%s，%s" % (public.get_msg_gettext('Second'),public.get_msg_gettext('Request timeout')),
+              public.get_msg_gettext('Keep alive'),
+              "%s，%s" % (public.get_msg_gettext('Second'),public.get_msg_gettext('Connection timeout')),
+              public.get_msg_gettext('Max keep-alive requests per connection')]
         gets = ["Timeout","KeepAlive","KeepAliveTimeout","MaxKeepAliveRequests"]
         if public.get_webserver() == 'apache':
             shutil.copyfile(self.apachedefaultfile, '/tmp/apdefault_file_bk.conf')
@@ -134,34 +134,34 @@ class apache:
             rep = "(%s)\s+(\w+)" % i
             k = re.search(rep, apachedefaultcontent)
             if not k:
-                return public.returnMsg(False, "Get Key {} False".format(k))
+                return public.return_msg_gettext(False, "Get Key {} False",(i,))
             k = k.group(1)
             v = re.search(rep, apachedefaultcontent)
             if not v:
-                return public.returnMsg(False, "Get Value {} False".format(v))
+                return public.return_msg_gettext(False, "Get Value {} False",(v,))
             v = v.group(2)
             psstr = ps[n]
             kv = {"name":k,"value":v,"ps":psstr}
             conflist.append(kv)
             n += 1
 
-        ps = [public.GetMsg("DEFUALT_PROCESSES"),
-              public.GetMsg("MAX_SPARE_THREADS"),
-              public.GetMsg("MIN_SPARE_THREADS"),
-              public.GetMsg("THREADS_PER_CHILD"),
-              public.GetMsg("MAX_REQUEST_WORKERS"),
-              public.GetMsg("MaxConnectionsPerChild")]
+        ps = [public.get_msg_gettext('Default processes'),
+              public.get_msg_gettext('Maximum number of idle threads'),
+              public.get_msg_gettext('Minimum number of idle threads available to handle request spikes'),
+              public.get_msg_gettext('Number of threads created by each child process'),
+              public.get_msg_gettext('Maximum number of connections that will be processed simultaneously'),
+              public.get_msg_gettext('Limit on the number of connections that an individual child server will handle during its life')]
         gets = ["StartServers","MaxSpareThreads","MinSpareThreads","ThreadsPerChild","MaxRequestWorkers","MaxConnectionsPerChild"]
         n = 0
         for i in gets:
             rep = "(%s)\s+(\w+)" % i
             k = re.search(rep, apachempmcontent)
             if not k:
-                return public.returnMsg(False, "Get Key {} False".format(k))
+                return public.return_msg_gettext(False, "Get Key {} False",(i,))
             k = k.group(1)
             v = re.search(rep, apachempmcontent)
             if not v:
-                return public.returnMsg(False, "Get Value {} False".format(v))
+                return public.return_msg_gettext(False, "Get Value {} False",(v,))
             v = v.group(2)
             psstr = ps[n]
             kv = {"name": k, "value": v, "ps": psstr}
@@ -173,7 +173,7 @@ class apache:
         apachedefaultcontent = public.readFile(self.apachedefaultfile)
         apachempmcontent = public.readFile(self.apachempmfile)
         if not "mpm_event_module" in apachempmcontent:
-            return public.returnMsg(False,"mpm_event_module conf not found or /www/server/apache/conf/extra/httpd-mpm.conf is empty")
+            return public.return_msg_gettext(False,"mpm_event_module conf not found or /www/server/apache/conf/extra/httpd-mpm.conf is empty")
         conflist = []
         getdict = get.__dict__
         for i in getdict.keys():
@@ -186,12 +186,12 @@ class apache:
         for c in conflist:
             if c["name"] == "KeepAlive":
                 if not re.search("on|off", c["value"]):
-                    return public.returnMsg(False, "INIT_ARGS_ERR")
+                    return public.return_msg_gettext(False, 'Parameter ERROR!')
             else:
                 print(c["value"])
                 if not re.search("\d+", c["value"]):
                     print(c["name"],c["value"])
-                    return public.returnMsg(False, 'INIT_ARGS_ERR')
+                    return public.return_msg_gettext(False, 'Parameter ERROR!')
 
             rep = "%s\s+\w+" % c["name"]
             if re.search(rep,apachedefaultcontent):
@@ -206,10 +206,10 @@ class apache:
         if (isError != True):
             shutil.copyfile('/tmp/_file_bk.conf', self.apachedefaultfile)
             shutil.copyfile('/tmp/proxyfile_bk.conf', self.apachempmfile)
-            return public.returnMsg(False, 'ERROR: %s<br><a style="color:red;">' % public.GetMsg("CONFIG_ERROR") + isError.replace("\n",
+            return public.returnMsg(False, 'ERROR: %s<br><a style="color:red;">' % public.get_msg_gettext('Configuration ERROR') + isError.replace("\n",
                                                                                             '<br>') + '</a>')
         public.serviceReload()
-        return public.returnMsg(True, 'SET_SUCCESS')
+        return public.return_msg_gettext(True, 'Setup successfully!')
 
     def add_httpd_access_log_format(self,args):
         '''
@@ -232,12 +232,12 @@ class apache:
                 self.del_httpd_access_log_format(args)
             conf = public.readFile(self.httpdconf)
             if not conf:
-                return public.returnMsg(False,'CONF_FILE_NOT_EXISTS')
+                return public.return_msg_gettext(False,'Configuration file not exist')
             reg = '<IfModule log_config_module>'
             conf = re.sub(reg,'<IfModule log_config_module>'+data,conf)
             public.writeFile(self.httpdconf,conf)
             public.serviceReload()
-            return public.returnMsg(True, 'SET_SUCCESS')
+            return public.return_msg_gettext(True, 'Setup successfully!')
         except:
             return public.returnMsg(False, str(public.get_error_info()))
 
@@ -249,13 +249,13 @@ class apache:
         '''
         conf = public.readFile(self.httpdconf)
         if not conf:
-            return public.returnMsg(False, 'CONF_FILE_NOT_EXISTS')
+            return public.return_msg_gettext(False, 'Configuration file not exist')
         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)
         public.writeFile(self.httpdconf,conf)
         public.serviceReload()
-        return public.returnMsg(True, 'SET_SUCCESS')
+        return public.return_msg_gettext(True, 'Setup successfully!')
 
     def del_all_log_format(self,args):
         all_format = self.get_httpd_access_log_format(args)
@@ -318,7 +318,7 @@ class apache:
             reg = "#LOG_FORMAT_BEGIN.*"
             conf = public.readFile(self.httpdconf)
             if not conf:
-                return public.returnMsg(False, 'CONF_FILE_NOT_EXISTS')
+                return public.return_msg_gettext(False, 'Configuration file not exist')
             data = re.findall(reg,conf)
             format_name = [i.split('LOG_FORMAT_BEGIN_')[-1] for i in data]
             format_log = {}
@@ -349,7 +349,7 @@ class apache:
                 website_conf_file = '/www/server/panel/vhost/apache/{}.conf'.format(site['name'])
                 conf = public.readFile(website_conf_file)
                 if not conf:
-                    return public.returnMsg(False, 'CONF_FILE_NOT_EXISTS')
+                    return public.return_msg_gettext(False, 'Configuration file not exist')
                 format_exist_reg = '(CustomLog\s+"/www.*\_log).*'
                 access_log = re.search(format_exist_reg, conf).groups()[0] + '" ' + args.log_format_name
                 if site['name'] not in sites and re.search(format_exist_reg,conf):
@@ -360,7 +360,7 @@ class apache:
                 conf = re.sub(format_exist_reg,access_log,conf)
                 public.writeFile(website_conf_file,conf)
             public.serviceReload()
-            return public.returnMsg(True, 'SET_SUCCESS')
+            return public.return_msg_gettext(True, 'Setup successfully!')
         except:
             return public.returnMsg(False, str(public.get_error_info()))