wip

slapos/equeue/__init__.py

@@ -72,8 +72,8 @@ def subprocess_capture(p, log, log_prefix, get_output=True):
     stdout_thread.join()
   if p.stderr:
     stderr_thread.join()
-  return (p.stdout and ''.join(stdout),
-          p.stderr and ''.join(stderr))
+  return (p.stdout and b''.join(stdout),
+          p.stderr and b''.join(stderr))
 
 class EqueueServer(socketserver.ThreadingUnixStreamServer):
 

slapos/promise/plugin/backupserver_check_backup.py

@@ -16,7 +16,7 @@ from tzlocal import get_localzone
 class RunPromise(GenericPromise):
 
   def __init__(self, config):
-    GenericPromise.__init__(self, config)
+    super(RunPromise, self).__init__(config)
     # check backup ran OK every 5 minutes
     self.setPeriodicity(minute=5)
 

slapos/promise/plugin/check_error_on_http_log.py

@@ -8,7 +8,7 @@ import os
 @implementer(interface.IPromise)
 class RunPromise(GenericPromise):
   def __init__(self, config):
-    GenericPromise.__init__(self, config)
+    super(RunPromise, self).__init__(config)
     # set periodicity to run the promise twice per day
     self.custom_frequency = int(self.getConfig('frequency', 720))
     self.setPeriodicity(self.custom_frequency)

slapos/promise/plugin/check_error_on_zope_longrequest_log.py

@@ -12,7 +12,7 @@ r = re.compile(br"^([0-9]+\-[0-9]+\-[0-9]+ [0-9]+\:[0-9]+\:[0-9]+)(\,[0-9]+) - (
 @implementer(interface.IPromise)
 class RunPromise(GenericPromise):
   def __init__(self, config):
-    GenericPromise.__init__(self, config)
+    super(RunPromise, self).__init__(config)
     self.setPeriodicity(minute=10)
 
   def sense(self):

slapos/promise/plugin/check_file_state.py

@@ -6,7 +6,7 @@ from slapos.grid.promise.generic import GenericPromise
 @implementer(interface.IPromise)
 class RunPromise(GenericPromise):
   def __init__(self, config):
-    GenericPromise.__init__(self, config)
+    super(RunPromise, self).__init__(config)
     # SR can set custom periodicity
     self.setPeriodicity(float(self.getConfig('frequency', 2)))
 

slapos/promise/plugin/check_free_disk_space.py

@@ -16,7 +16,7 @@ from slapos.collect.db import Database
 class RunPromise(GenericPromise):
 
   def __init__(self, config):
-    GenericPromise.__init__(self, config)
+    super(RunPromise, self).__init__(config)
     # check disk space at least every 3 minutes
     self.setPeriodicity(minute=3)
 

slapos/promise/plugin/check_icmp_packet_lost.py

@@ -8,7 +8,7 @@ from slapos.networkbench.ping import ping, ping6
 @implementer(interface.IPromise)
 class RunPromise(GenericPromise):
   def __init__(self, config):
-    GenericPromise.__init__(self, config)
+    super(RunPromise, self).__init__(config)
     # set periodicity to run the promise twice per day
     self.custom_frequency = int(self.getConfig('frequency', 720))
     self.setPeriodicity(self.custom_frequency)

slapos/promise/plugin/check_partition_deployment_state.py

@@ -8,7 +8,7 @@ from datetime import datetime
 class RunPromise(GenericPromise):
 
   def __init__(self, config):
-    GenericPromise.__init__(self, config)
+    super(RunPromise, self).__init__(config)
     self.setPeriodicity(minute=1)
 
   def sense(self):

slapos/promise/plugin/check_port_listening.py

-from zope import interface as zope_interface
+from zope.interface import implementer
 from slapos.grid.promise import interface
 from slapos.grid.promise.generic import GenericPromise
 
 import socket
 import sys
 
+@implementer(interface.IPromise)
 class RunPromise(GenericPromise):
-
-  zope_interface.implements(interface.IPromise)
-
   def __init__(self, config):
-    GenericPromise.__init__(self, config)
+    super(RunPromise, self).__init__(config)
     # check port is listening at least every 2 minutes
     self.setPeriodicity(minute=2)
 

slapos/promise/plugin/check_re6st_optimal_status.py

@@ -8,7 +8,7 @@ from slapos.networkbench.ping import ping, ping6
 @implementer(interface.IPromise)
 class RunPromise(GenericPromise):
   def __init__(self, config):
-    GenericPromise.__init__(self, config)
+    super(RunPromise, self).__init__(config)
     # set periodicity to run the promise twice per day
     self.custom_frequency = int(self.getConfig('frequency', 720))
     self.setPeriodicity(self.custom_frequency)

slapos/promise/plugin/check_server_cpu_load.py

@@ -9,7 +9,7 @@ import os
 class RunPromise(GenericPromise):
 
   def __init__(self, config):
-    GenericPromise.__init__(self, config)
+    super(RunPromise, self).__init__(config)
     # test load every 3 minutes
     self.setPeriodicity(minute=3)
 
@@ -24,7 +24,8 @@ class RunPromise(GenericPromise):
     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
       result_list = top_result.split('\n')

slapos/promise/plugin/check_url_available.py

@@ -8,7 +8,7 @@ import requests
 @implementer(interface.IPromise)
 class RunPromise(GenericPromise):
   def __init__(self, config):
-    GenericPromise.__init__(self, config)
+    super(RunPromise, self).__init__(config)
     # SR can set custom periodicity
     self.setPeriodicity(float(self.getConfig('frequency', 2)))
 

slapos/promise/plugin/monitor_bootstrap_status.py

@@ -10,7 +10,7 @@ from .util import tail_file
 class RunPromise(GenericPromise):
 
   def __init__(self, config):
-    GenericPromise.__init__(self, config)
+    super(RunPromise, self).__init__(config)
     self.setPeriodicity(minute=2)
 
   def sense(self):

slapos/promise/plugin/trafficserver_cache_availability.py

-from zope import interface as zope_interface
+from zope.interface import implementer
 from slapos.grid.promise import interface
 from slapos.grid.promise.generic import GenericPromise
 
@@ -7,12 +7,10 @@ try:
 except ImportError:
   import subprocess
 
+@implementer(interface.IPromise)
 class RunPromise(GenericPromise):
-
-  zope_interface.implements(interface.IPromise)
-
   def __init__(self, config):
-    GenericPromise.__init__(self, config)
+    super(RunPromise, self).__init__(config)
     self.setPeriodicity(minute=int(self.getConfig('frequency', 5)))
 
   def sense(self):
@@ -23,10 +21,10 @@ class RunPromise(GenericPromise):
 
     if 'traffic_line' in wrapper:
       args = [wrapper, '-r',  'proxy.node.cache.percent_free']
-      message = "Cache not available, availability: %s"
+      message = "Cache not available, availability:"
     elif 'traffic_ctl' in wrapper:
       args = [wrapper, 'metric', 'get', 'proxy.process.cache.percent_full']
-      message = "Cache not available, occupation: %s"
+      message = "Cache not available, occupation:"
     else:
       self.logger.error("Wrapper %r not supported." % (wrapper,))
       return
@@ -40,7 +38,7 @@ class RunPromise(GenericPromise):
     if process.returncode == 0:
       self.logger.info("OK")
     else:
-      self.logger.error(message % (result,))
+      self.logger.error(message, result)
 
   def anomaly(self):
     """

slapos/promise/plugin/validate_frontend_configuration.py

-from zope import interface as zope_interface
+from zope.interface import implementer
 from slapos.grid.promise import interface
 from slapos.grid.promise.generic import GenericPromise
 try:
@@ -6,12 +6,10 @@ try:
 except ImportError:
   import subprocess
 
+@implementer(interface.IPromise)
 class RunPromise(GenericPromise):
-
-  zope_interface.implements(interface.IPromise)
-
   def __init__(self, config):
-    GenericPromise.__init__(self, config)
+    super(RunPromise, self).__init__(config)
     # check configuration every 5 minutes (only for anomaly)
     self.setPeriodicity(minute=int(self.getConfig('frequency', 5)))
 
@@ -32,7 +30,7 @@ class RunPromise(GenericPromise):
     if process.returncode == 0:
       self.logger.info("OK")
     else:
-      self.logger.error("%s" % message)
+      self.logger.error(message)
 
   def anomaly(self):
     return self._anomaly(result_count=1, failure_amount=1)

slapos/pubsub/notifier.py

@@ -80,8 +80,7 @@ def main():
   saveStatus('STARTED')
 
   if args.max_run <= 0:
-    print("--max-run argument takes a strictely positive number as argument")
-    sys.exit(-1)
+    parser.error("--max-run argument takes a strictly positive number as argument")
 
   while args.max_run > 0:
     try:

slapos/test/monitor/testrunpromise.py

@@ -93,7 +93,7 @@ from slapos.grid.promise import GenericPromise
 class RunPromise(GenericPromise):
 
  def __init__(self, config):
-   GenericPromise.__init__(self, config)
+   super(RunPromise, self).__init__(config)
    self.setPeriodicity(minute=%(periodicity)s)
 
  def sense(self):