wip

slapos/promise/plugin/check_server_cpu_load.py

@@ -16,15 +16,15 @@ class RunPromise(GenericPromise):
   def checkCPULoad(self, tolerance=2.2):
 
     # tolerance=1.5 => accept CPU load up to 1.5 =150%
-    uptime_result = subprocess.check_output(['uptime'], universal_newlines=True)
+    uptime_result = subprocess.check_output('uptime', universal_newlines=True)
     line = uptime_result.strip().split(' ')
     load, load5, long_load = line[-3:]
     long_load = float(long_load.replace(',', '.'))
-    core_count = int(subprocess.check_output(['nproc']).strip())
+    core_count = int(subprocess.check_output('nproc').strip())
     max_load = core_count * tolerance
     if long_load > max_load:
       # display top statistics
-      top_result = subprocess.check_output(['top', '-n', '1', '-b'],
+      top_result = subprocess.check_output(('top', '-n', '1', '-b'),
                                            universal_newlines=True)
       message = "CPU load is high: %s %s %s\n\n" % (load, load5, long_load)
       i = 0

slapos/promise/plugin/trafficserver_cache_availability.py

@@ -29,16 +29,17 @@ class RunPromise(GenericPromise):
       self.logger.error("Wrapper %r not supported." % (wrapper,))
       return
 
-    process = subprocess.Popen(
+    try:
+      subprocess.subprocess.check_output(
         args,
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
-    )
-    result = process.communicate()[0].strip()
-    if process.returncode == 0:
-      self.logger.info("OK")
+      )
+    except subprocess.CalledProcessError as e:
+      self.logger.error(message, result if str is bytes else
+                                 result.decode('utf-8', 'replace'))
     else:
-      self.logger.error(message, result)
+      self.logger.info("OK")
 
   def anomaly(self):
     """