Refactoring and preparations for JSON API

1 files changed, 6 insertions, 10 deletions

diff --git a/gitautodeploy/parsers/generic.py b/gitautodeploy/parsers/generic.py
index 7b150d2..a93e90b 100644
--- a/gitautodeploy/parsers/generic.py
+++ b/gitautodeploy/parsers/generic.py
@@ -2,22 +2,18 @@ from common import WebhookRequestParser
 
 class GenericRequestParser(WebhookRequestParser):
 
-    def get_repo_params_from_request(self, request_headers, request_body):
+    def get_repo_configs(self, request_headers, request_body, action):
         import json
-        import logging
 
-        logger = logging.getLogger()
         data = json.loads(request_body)
 
         repo_urls = []
-        ref = ""
-        action = ""
 
-        logger.debug("Received event from unknown origin. Assume generic data format.")
+        action.log_info("Received event from unknown origin. Assume generic data format.")
 
         if 'repository' not in data:
-            logger.error("Unable to recognize data format")
-            return [], ref or "master", action
+            action.log_error("Unable to recognize data format")
+            return []
 
         # One repository may posses multiple URLs for different protocols
         for k in ['url', 'git_http_url', 'git_ssh_url', 'http_url', 'ssh_url']:
@@ -25,7 +21,7 @@ class GenericRequestParser(WebhookRequestParser):
                 repo_urls.append(data['repository'][k])
 
         # Get a list of configured repositories that matches the incoming web hook reqeust
-        repo_configs = self.get_matching_repo_configs(repo_urls)
+        repo_configs = self.get_matching_repo_configs(repo_urls, action)
 
-        return repo_configs, ref or "master", action, repo_urls
+        return repo_configs