From 44d0514da68f0f6be01fe925eddacba72e800b1e Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Thu, 5 Sep 2019 11:47:04 +0200
Subject: [PATCH] Improve logging

---
 wo/cli/main.py                  | 10 ++++++----
 wo/cli/plugins/secure.py        |  4 ++--
 wo/cli/plugins/site.py          |  1 +
 wo/cli/plugins/stack.py         |  4 ++--
 wo/cli/plugins/stack_migrate.py | 14 +++++++++++++-
 wo/core/logging.py              |  6 +++---
 6 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/wo/cli/main.py b/wo/cli/main.py
index 4579177..d0c009e 100644
--- a/wo/cli/main.py
+++ b/wo/cli/main.py
@@ -1,12 +1,14 @@
 """WordOps main application entry point."""
-import sys
 import os
+import sys
+
 from cement.core import foundation
-from cement.utils.misc import init_defaults
-from cement.core.exc import FrameworkError, CaughtSignal
+from cement.core.exc import CaughtSignal, FrameworkError
 from cement.ext.ext_argparse import ArgParseArgumentHandler
-from wo.core import exc
+from cement.utils.misc import init_defaults
+
 from wo.cli.ext.wo_outputhandler import WOOutputHandler
+from wo.core import exc
 
 # this has to happen after you import sys, but before you import anything
 # from Cement "source: https://github.com/datafolklabs/cement/issues/290"
diff --git a/wo/cli/plugins/secure.py b/wo/cli/plugins/secure.py
index e8ca67e..38f8190 100644
--- a/wo/cli/plugins/secure.py
+++ b/wo/cli/plugins/secure.py
@@ -86,12 +86,12 @@ class WOSecureController(CementBaseController):
             while not pargs.user_input.isdigit():
                 Log.info(self, "Please enter a valid port number ")
                 pargs.user_input = input("WordOps "
-                                                  "admin port [22222]:")
+                                         "admin port [22222]:")
         if not pargs.user_input:
             port = input("WordOps admin port [22222]:")
             if port == "":
                 pargs.user_input = 22222
-            while not port.isdigit() and port != "":
+            while (not port.isdigit()) and (port != "") and (not port < 65556):
                 Log.info(self, "Please Enter valid port number :")
                 port = input("WordOps admin port [22222]:")
             pargs.user_input = port
diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py
index 2050fad..4e19cfc 100644
--- a/wo/cli/plugins/site.py
+++ b/wo/cli/plugins/site.py
@@ -7,6 +7,7 @@ from subprocess import Popen
 
 from cement.core import handler, hook
 from cement.core.controller import CementBaseController, expose
+
 from wo.cli.plugins.site_functions import *
 from wo.cli.plugins.sitedb import (addNewSite, deleteSiteInfo, getAllsites,
                                    getSiteInfo, updateSiteInfo)
diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py
index 72f6c79..ec55bf9 100644
--- a/wo/cli/plugins/stack.py
+++ b/wo/cli/plugins/stack.py
@@ -9,11 +9,11 @@ import re
 import shutil
 import string
 
-import requests
-
 import psutil
+import requests
 from cement.core import handler, hook
 from cement.core.controller import CementBaseController, expose
+
 from wo.cli.plugins.site_functions import *
 from wo.cli.plugins.sitedb import *
 from wo.cli.plugins.stack_migrate import WOStackMigrateController
diff --git a/wo/cli/plugins/stack_migrate.py b/wo/cli/plugins/stack_migrate.py
index 5c47906..7b64b37 100644
--- a/wo/cli/plugins/stack_migrate.py
+++ b/wo/cli/plugins/stack_migrate.py
@@ -3,6 +3,7 @@ import os
 
 from cement.core import handler, hook
 from cement.core.controller import CementBaseController, expose
+
 from wo.core.apt_repo import WORepo
 from wo.core.aptget import WOAptGet
 from wo.core.logging import Log
@@ -28,6 +29,17 @@ class WOStackMigrateController(CementBaseController):
         # Backup all database
         WOMysql.backupAll(self)
 
+        if not WOVariables.wo_distro == 'raspbian':
+            if (not WOVariables.wo_platform_codename == 'jessie'):
+                wo_mysql = ["mariadb-server", "percona-toolkit",
+                            "python3-mysqldb", "mariadb-backup"]
+            else:
+                wo_mysql = ["mariadb-server", "percona-toolkit",
+                            "python3-mysql.connector"]
+        else:
+            wo_mysql = ["mariadb-server", "percona-toolkit",
+                        "python3-mysqldb"]
+
         # Add MariaDB repo
         Log.info(self, "Adding repository for MariaDB, please wait...")
 
@@ -78,7 +90,7 @@ class WOStackMigrateController(CementBaseController):
                                    log=False)
 
         # Install MariaDB
-        apt_packages = ["mariadb-server"]
+        apt_packages = wo_mysql
 
         Log.info(self, "Updating apt-cache, hang on...")
         WOAptGet.update(self)
diff --git a/wo/core/logging.py b/wo/core/logging.py
index 3078f59..3bdb9b5 100644
--- a/wo/core/logging.py
+++ b/wo/core/logging.py
@@ -51,7 +51,7 @@ class Log:
         Logs info messages with validation step
         """
         print(
-            Log.OKBLUE + msg +
+            Log.OKBLUE + "{0:22}".format(msg) +
             "  [" + Log.ENDC + ".." + Log.OKBLUE + "]" + Log.ENDC, end=end)
         if log:
             self.app.log.info(Log.OKBLUE + msg + Log.ENDC)
@@ -61,7 +61,7 @@ class Log:
         Logs info messages after validation step
         """
         print(
-            Log.OKBLUE + msg +
+            Log.OKBLUE + "{0:22}".format(msg) +
             "  [" + Log.ENDC + Log.OKGREEN + "OK" +
             Log.ENDC + Log.OKBLUE + "]" + Log.ENDC, end=end)
         if log:
@@ -72,7 +72,7 @@ class Log:
         Logs info messages after validation step
         """
         print(
-            Log.OKBLUE + msg +
+            Log.OKBLUE + "{0:22}".format(msg) +
             "  [" + Log.ENDC + Log.FAIL + "OK" +
             Log.ENDC + Log.OKBLUE + "]" + Log.ENDC, end=end)
         if log: