updated log messages

config/ee.conf

@@ -40,7 +40,7 @@
 
 [stack]
 
-# ip-address = 0.0.0.0/0
+ip-address = 0.0.0.0/0 1.1.1.1 2.2.2.2
 
 [mysql]
 

ee/cli/bootstrap.py

@@ -5,7 +5,6 @@
 
 from cement.core import handler
 from ee.cli.controllers.base import EEBaseController
-from ee.cli.controllers.secure import EESecureController
 from ee.cli.controllers.isl import EEImportslowlogController
 from ee.cli.controllers.info import EEInfoController
 
@@ -14,4 +13,3 @@ def load(app):
     handler.register(EEBaseController)
     handler.register(EEInfoController)
     handler.register(EEImportslowlogController)
-    handler.register(EESecureController)

ee/cli/controllers/secure.py

@@ -1,27 +0,0 @@
-from cement.core.controller import CementBaseController, expose
-
-
-class EESecureController(CementBaseController):
-    class Meta:
-        label = 'secure'
-        stacked_on = 'base'
-        stacked_type = 'nested'
-        description = 'secure command used for debugging issued with stack or \
-                        site specific configuration'
-        arguments = [
-            (['--ip'],
-                dict(help='whitelist ip addresses to access admin tools without \
-                     authentication',
-                     action='store_true')),
-            (['--auth'],
-                dict(help='change http auth credentials',
-                     action='store_true')),
-            (['--port'],
-                dict(help='change port for admin tools default is 22222',
-                     action='store_true')),
-            ]
-
-    @expose(hide=True)
-    def default(self):
-        # TODO Default action for ee debug command
-        print("Inside EESecureController.default().")

ee/core/download.py

@@ -21,21 +21,16 @@ class EEDownload():
                 urllib.request.urlretrieve(url, filename)
                 self.app.log.info("Done")
             except urllib.error.URLError as e:
-                self.app.log.error("Error is :"
-                                   + os.path.basename(url)+e.reason())
                 self.app.log.info("Unable to donwload file, [{err}]"
                                   .format(err=str(e.reason)))
                 return False
             except urllib.error.HTTPError as e:
-                self.app.log.error("Package download failed", e.reason())
-                self.app.log.info("Package download failed. [{err}]"
+                self.app.log.error("Package download failed. [{err}]"
                                    .format(err=str(e.reason)))
                 return False
             except urllib.error.ContentTooShortError as e:
                 self.app.log.error("Package download failed. The amount of the"
                                    " downloaded data is less than "
-                                   "the expected amount"+e.reason())
-                self.app.log.info("Package download failed. The amount of the"
-                                  "downloaded data is less than"
-                                  " the expected amount")
+                                   "the expected amount \{0} {1}"
+                                   .format(e.errno, e.strerror))
                 return False

ee/core/extract.py

@@ -14,6 +14,6 @@ class EEExtract():
             os.remove(file)
             return True
         except tarfile.TarError as e:
-            self.app.log.error('Unable to extract file', e.reason())
-            self.app.log.info("Unable to extract file "+file)
+            self.app.log.error('Unable to extract file \{0} {1}'
+                               .format(e.errno, e.strerror))
             return False

ee/core/mysql.py

@@ -28,8 +28,8 @@ class EEMysql():
                                        user=user, passwd=passwd)
                 cur = conn.cursor()
             except Exception as e:
-                self.app.log.error('Unable to connect to database', e.reason())
-                self.app.log.info("Unable to connect to database")
+                self.app.log.error('Unable to connect to database\{0} {1}'
+                                   .format(e.errno, e.strerror))
                 return False
 
         try:

ee/core/services.py

@@ -20,7 +20,8 @@ class EEService():
                 else:
                     self.app.log.error(retcode[1])
             except OSError as e:
-                self.app.log.error("Execution failed:",  e)
+                self.app.log.error("Unable to start service \ {0} {1}"
+                                   .format(e.errno, e.strerror))
                 return False
 
     def stop_service(self, service_name):
@@ -33,7 +34,8 @@ class EEService():
                 else:
                     return False
             except OSError as e:
-                self.app.log.error("Execution failed:", e)
+                self.app.log.error("Unable to stop services \ {0}{1}"
+                                   .format(e.errno, e.strerror))
                 return False
 
     def restart_service(self, service_name):
@@ -41,7 +43,8 @@ class EEService():
                 EEService.stop_service(self, service_name)
                 EEService.start_service(self, service_name)
             except OSError as e:
-                self.app.log.error("Execution failed:",  e)
+                self.app.log.error("Unable to restart services \{0} {1}"
+                                   .format(e.errno, e.strerror))
 
     def get_service_status(self, service_name):
         try:
@@ -57,4 +60,6 @@ class EEService():
             else:
                 return False
         except OSError as e:
+            self.app.log.error("Unable to get services status \ {0}{1}"
+                               .format(e.errno, e.strerror))
             return False

ee/core/shellexec.py

@@ -19,5 +19,6 @@ class EEShellExec():
                 self.app.log.warn(retcode[1])
                 return False
         except OSError as e:
-            self.app.log.info(e)
+            self.app.log.error("Unable to execute command \ {0}{1}"
+                               .format(e.errno, e.strerror))
             return False