v3.11.1 (#215)

- `--fail2ban` in wo stack upgrade
- error with `wo maintenance`
- php-igbinary missing for php74 (run `wo stack upgrade` to install it)
- opcache reset with `wo clean`

wo/core/apt_repo.py

@@ -48,9 +48,21 @@ class WORepo():
                 Log.debug(self, "{0}".format(e))
                 Log.error(self, "Unable to add repo")
         if ppa is not None:
+            ppa_split = ppa.split(':')[1]
+            ppa_author = ppa_split.split('/')[0]
+            Log.debug(self, "ppa_author = {0}".format(ppa_author))
+            ppa_package = ppa_split.split('/')[1]
+            Log.debug(self, "ppa_package = {0}".format(ppa_package))
+            if os.path.exists(
+                '/etc/apt/sources.list.d/{0}-ubuntu-{1}-{2}.list'
+                    .format(ppa_author,
+                            ppa_package, WOVar.wo_platform_codename)):
+                Log.debug(self, "ppa already added")
+                return True
             if WOShellExec.cmd_exec(
                     self, "LC_ALL=C.UTF-8 add-apt-repository -y '{ppa_name}'"
                     .format(ppa_name=ppa)):
+                Log.debug(self, "Added PPA {0}".format(ppa))
                 return True
         return False
 

wo/core/aptget.py

@@ -189,7 +189,7 @@ class WOAptGet():
         """
         try:
             orig_out = sys.stdout
-            sys.stdout = open(self.app.config.get('log.logging', 'file'),
+            sys.stdout = open(self.app.config.get('log.colorlog', 'file'),
                               encoding='utf-8', mode='a')
             apt_get.autoclean("-y")
             sys.stdout = orig_out

wo/core/logging.py

@@ -38,13 +38,13 @@ class Log:
         Logs warning into log file
         """
         print(Log.WARNING + msg + Log.ENDC)
-        self.app.log.warn(Log.BOLD + msg + Log.ENDC)
+        self.app.log.warning(Log.BOLD + msg + Log.ENDC)
 
     def debug(self, msg):
         """
         Logs debug messages into log file
         """
-        self.app.log.debug(Log.HEADER + msg + Log.ENDC)
+        self.app.log.debug(Log.HEADER + msg + Log.ENDC, __name__)
 
     def wait(self, msg, end='\r', log=True):
         """

wo/core/logwatch.py

@@ -65,7 +65,7 @@ class LogWatcher(object):
     def __del__(self):
         self.close()
 
-    def loop(self, interval=0.1, async=False):
+    def loop(self, interval=0.1, req_async=False):
         """Start the loop.
         If async is True make one loop then return.
         """
@@ -73,7 +73,7 @@ class LogWatcher(object):
             self.update_files()
             for fid, file in list(iter(self.files_map.items())):
                 self.readfile(file)
-            if async:
+            if req_async:
                 return
             time.sleep(interval)
 

wo/core/variables.py

@@ -14,7 +14,7 @@ class WOVar():
     """Intialization of core variables"""
 
     # WordOps version
-    wo_version = "3.11.0"
+    wo_version = "3.11.1"
     # WordOps packages versions
     wo_wp_cli = "2.4.0"
     wo_adminer = "4.7.5"
@@ -150,7 +150,7 @@ class WOVar():
     for module in wo_module:
         wo_php74 = wo_php74 + ["php7.4-{0}".format(module)]
 
-    wo_php_extra = ["php-memcached", "php-imagick",
+    wo_php_extra = ["php-memcached", "php-imagick", "php-igbinary",
                     "graphviz", "php-xdebug", "php-msgpack", "php-redis"]
 
     wo_mysql = ["mariadb-server", "percona-toolkit"]