apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.14'

Browse Source
This commit is contained in:
Daan Hoogland 2020-10-24 12:55:25 +02:00
commit ee5094b77f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
systemvm/debian/opt/cloud/bin/cs/CsApp.py
View File

@ -17,7 +17,6 @@
# under the License. # under the License.
import os import os
from CsFile import CsFile from CsFile import CsFile
from CsProcess import CsProcess
import CsHelper import CsHelper

4
systemvm/debian/opt/cloud/bin/cs/CsProcess.py
View File

@ -40,9 +40,9 @@ class CsProcess(object):
def find_pid(self): def find_pid(self):
self.pid = [] self.pid = []
for i in CsHelper.execute("ps aux"):
items = len(self.search) items = len(self.search)
proc = re.split(r"\s+", i)[items*-1:] for i in CsHelper.execute("ps aux"):
proc = re.split(r"\s+", i)[10:]
matches = len([m for m in proc if m in self.search]) matches = len([m for m in proc if m in self.search])
if matches == items: if matches == items:
self.pid.append(re.split(r"\s+", i)[1]) self.pid.append(re.split(r"\s+", i)[1])