summaryrefslogtreecommitdiffstats
path: root/gitautodeploy/httpserver.py
diff options
context:
space:
mode:
authorOliver Poignant <oliver@poignant.se>2016-04-10 00:41:35 +0200
committerOliver Poignant <oliver@poignant.se>2016-04-10 00:41:35 +0200
commitff9f691c80a4b969369685fca1d963d7c70e9055 (patch)
treea86b864502f5cb5521109c92f700b42fc0910602 /gitautodeploy/httpserver.py
parent86ff375bf4c4b6c04ab44ea4be7dd90730f824c1 (diff)
parentd75e01e56ce14f269d1d47708e3db8ad628804c7 (diff)
downloadGit-Auto-Deploy-ff9f691c80a4b969369685fca1d963d7c70e9055.zip
Git-Auto-Deploy-ff9f691c80a4b969369685fca1d963d7c70e9055.tar.gz
Git-Auto-Deploy-ff9f691c80a4b969369685fca1d963d7c70e9055.tar.bz2
Merge pull request #79 from DirectorX/ssl-http-server
Ssl http server
Diffstat (limited to 'gitautodeploy/httpserver.py')
-rw-r--r--gitautodeploy/httpserver.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/gitautodeploy/httpserver.py b/gitautodeploy/httpserver.py
index 0760067..99fc574 100644
--- a/gitautodeploy/httpserver.py
+++ b/gitautodeploy/httpserver.py
@@ -118,6 +118,7 @@ class WebhookRequestHandler(BaseHTTPRequestHandler):
import logging
from wrappers import GitWrapper
from lock import Lock
+ import json
logger = logging.getLogger()
data = json.loads(request_body)
@@ -190,4 +191,4 @@ class WebhookRequestHandler(BaseHTTPRequestHandler):
# Release the lock if it's ours
if waiting_lock.has_lock():
- waiting_lock.release() \ No newline at end of file
+ waiting_lock.release()