Bug fixes

3 files changed, 20 insertions, 24 deletions

diff --git a/gitautodeploy/cli/config.py b/gitautodeploy/cli/config.py
index bde731a..f2f279e 100644
--- a/gitautodeploy/cli/config.py
+++ b/gitautodeploy/cli/config.py
@@ -81,21 +81,6 @@ def rename_legacy_attribute_names(config):
             del config[old_name]
             print("Config option '%s' is deprecated. Please use '%s' instead." % (old_name, new_name))
 
-#    if 'ssl-pem-file' in config:
-#        config['ssl-cert'] = config['ssl-pem-file']
-#        del config['ssl-pem-file']
-#        logger.warn("Config option 'ssl-pem-file' is deprecated. Please use 'ssl-cert' instead.")
-
-#    if 'host' in config:
-#        config['http-host'] = config['host']
-#        del config['host']
-#        logger.warn("Config option 'ssl-pem-file' is deprecated. Please use 'http-host' instead.")
-
-#    if 'port' in config:
-#        config['http-port'] = config['port']
-#        del config['port']
-#        logger.warn("Config option 'ssl-pem-file' is deprecated. Please use 'http-port' instead.")
-
     return config
 
 
@@ -117,8 +102,8 @@ def get_config_from_environment():
     if 'GAD_SSH_KEYSCAN' in os.environ:
         config['ssh-keyscan'] = True
 
-    if 'GAD_SSL' in os.environ:
-        config['ssl'] = True
+    if 'GAD_SSL_KEY' in os.environ:
+        config['ssl-key'] = os.environ['GAD_SSL_KEY']
 
     if 'GAD_SSL_CERT' in os.environ:
         config['ssl-cert'] = os.environ['GAD_SSL_CERT']
@@ -158,11 +143,13 @@ def get_config_from_argv(argv):
     parser.add_argument("-d", "--daemon-mode",
                         help="run in background (daemon mode)",
                         dest="daemon-mode",
+                        default=None,
                         action="store_true")
 
     parser.add_argument("-q", "--quiet",
                         help="supress console output",
                         dest="quiet",
+                        default=None,
                         action="store_true")
 
     parser.add_argument("-c", "--config",
@@ -173,6 +160,7 @@ def get_config_from_argv(argv):
     parser.add_argument("--ssh-keyscan",
                         help="scan repository hosts for ssh keys",
                         dest="ssh-keyscan",
+                        default=None,
                         action="store_true")
 
     parser.add_argument("--pid-file",
@@ -226,8 +214,9 @@ def get_config_from_argv(argv):
                         type=int)
 
     parser.add_argument("--ssl",
-                        help="use ssl",
-                        dest="ssl",
+                        help="enable https",
+                        dest="https-enabled",
+                        default=None,
                         action="store_true")
 
     parser.add_argument("--ssl-key",
diff --git a/gitautodeploy/gitautodeploy.py b/gitautodeploy/gitautodeploy.py
index 8561b70..fa756cd 100644
--- a/gitautodeploy/gitautodeploy.py
+++ b/gitautodeploy/gitautodeploy.py
@@ -306,7 +306,9 @@ class GitAutoDeploy(object):
             self.stop()
             self.exit()
 
-        print("HTTP server did quit")
+        event = SystemEvent()
+        self._event_store.register_action(event)
+        event.log_info('HTTP server did quit')
 
     def serve_https(self):
         """Starts a HTTPS server that listens for webhook requests and serves the web ui."""
@@ -325,7 +327,7 @@ class GitAutoDeploy(object):
             return
 
         if not os.path.isfile(self._config['ssl-cert']):
-            self._startup_event.log_critical("Unable to enable SSL: File does not exist: %s" % self._config['ssl-cert'])
+            self._startup_event.log_critical("Unable to activate SSL: File does not exist: %s" % self._config['ssl-cert'])
             return
 
         # Setup
@@ -375,7 +377,9 @@ class GitAutoDeploy(object):
             self.stop()
             self.exit()
 
-        print("HTTPS server did quit")
+        event = SystemEvent()
+        self._event_store.register_action(event)
+        event.log_info('HTTPS server did quit')
 
     def serve_wss(self):
         """Start a web socket server over SSL, used by the web UI to get notifications about updates."""
@@ -389,7 +393,7 @@ class GitAutoDeploy(object):
             return
 
         if not os.path.isfile(self._config['ssl-cert']):
-            self._startup_event.log_critical("Unable to enable SSL: File does not exist: %s" % self._config['ssl-cert'])
+            self._startup_event.log_critical("Unable to activate SSL: File does not exist: %s" % self._config['ssl-cert'])
             return
 
         try:
@@ -432,7 +436,9 @@ class GitAutoDeploy(object):
         except ImportError:
             self._startup_event.log_error("Unable to start web socket server due to missing dependency.")
 
-        print("WSS server did quit")
+        event = SystemEvent()
+        self._event_store.register_action(event)
+        event.log_info('WSS server did quit')
 
     def serve_forever(self):
         """Start HTTP and web socket servers."""
diff --git a/gitautodeploy/wrappers/process.py b/gitautodeploy/wrappers/process.py
index a810f23..b33f580 100644
--- a/gitautodeploy/wrappers/process.py
+++ b/gitautodeploy/wrappers/process.py
@@ -17,6 +17,7 @@ class ProcessWrapper():
         kwargs['stdout'] = PIPE
         kwargs['stderr'] = PIPE
 
+        supressStderr = None
         if 'supressStderr' in kwargs:
             supressStderr = kwargs['supressStderr']
             del kwargs['supressStderr']