summaryrefslogtreecommitdiffstats
path: root/gitautodeploy/parsers/gitlab.py
diff options
context:
space:
mode:
authorOliver Poignant <oliver@poignant.se>2016-05-29 10:39:53 +0200
committerOliver Poignant <oliver@poignant.se>2016-05-29 10:39:53 +0200
commitb2f95fa7a1f12ea4b8029320db4c7458a9a32feb (patch)
tree2258bb6d704d19e0a8bd7a043781bfa4f4ae214e /gitautodeploy/parsers/gitlab.py
parent110be3c3ea3d34c5cd686061f9dda7e69222e536 (diff)
parent84e99d89e75b4c2e5e5e8678a15adb9d391daa44 (diff)
downloadGit-Auto-Deploy-b2f95fa7a1f12ea4b8029320db4c7458a9a32feb.zip
Git-Auto-Deploy-b2f95fa7a1f12ea4b8029320db4c7458a9a32feb.tar.gz
Git-Auto-Deploy-b2f95fa7a1f12ea4b8029320db4c7458a9a32feb.tar.bz2
Merge branch 'master' into development
Diffstat (limited to 'gitautodeploy/parsers/gitlab.py')
-rw-r--r--gitautodeploy/parsers/gitlab.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/gitautodeploy/parsers/gitlab.py b/gitautodeploy/parsers/gitlab.py
index 580fed2..3551dc6 100644
--- a/gitautodeploy/parsers/gitlab.py
+++ b/gitautodeploy/parsers/gitlab.py
@@ -15,7 +15,7 @@ class GitLabRequestParser(WebhookRequestParser):
gitlab_event = 'x-gitlab-event' in request_headers and request_headers['x-gitlab-event']
- logger.info("Received '%s' event from GitLab" % gitlab_event)
+ logger.debug("Received '%s' event from GitLab" % gitlab_event)
if 'repository' not in data:
logger.error("Unable to recognize data format")
@@ -37,7 +37,7 @@ class GitLabRequestParser(WebhookRequestParser):
# Get a list of configured repositories that matches the incoming web hook reqeust
repo_configs = self.get_matching_repo_configs(repo_urls)
- return repo_configs, ref or "master", action
+ return repo_configs, ref or "master", action, repo_urls
class GitLabCIRequestParser(WebhookRequestParser):
@@ -53,7 +53,7 @@ class GitLabCIRequestParser(WebhookRequestParser):
ref = ""
action = ""
- logger.info('Received event from Gitlab CI')
+ logger.debug('Received event from Gitlab CI')
if 'push_data' not in data:
logger.error("Unable to recognize data format")
@@ -71,4 +71,4 @@ class GitLabCIRequestParser(WebhookRequestParser):
# Get a list of configured repositories that matches the incoming web hook reqeust
repo_configs = self.get_matching_repo_configs(repo_urls)
- return repo_configs, ref or "master", action \ No newline at end of file
+ return repo_configs, ref or "master", action, repo_urls \ No newline at end of file