issue #5 Добавил вывод ошибки

kubikvest · Oct 3, 2016 · 0d1b933 · 0d1b933
1 parent ff0a0c5
commit 0d1b933
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ include vars.mk
 
 IMAGE = kubikvest/xodos
 CONTAINER = kubikvest_webhook
-TAG = 1.0.1
+TAG = 1.0.2
 PORT = -p 8301:80
 DOCKER_RM = false
 

diff --git a/build/rootfs.tar.gz b/build/rootfs.tar.gz
diff --git a/src/app/webhook.lua b/src/app/webhook.lua
@@ -39,20 +39,28 @@ ngx.status = ngx.HTTP_OK
 ngx.say("200 HTTP_OK")
 ngx.eof()
 
-os.execute("cd /tmp; git clone " .. data.repository.clone_url .. "; cd /tmp/" .. data.repository.name .. "; make deploy -I ../; cd /;rm -rf /tmp/" .. data.repository.name)
+local color = "#a63636"
+local msg   = "fail"
+
+local result = os.execute("cd /tmp; git clone " .. data.repository.clone_url .. "; cd /tmp/" .. data.repository.name .. "; make deploy -I ../; cd /;rm -rf /tmp/" .. data.repository.name)
+
+if result == 0 then
+    color = "#36a64f"
+    msg = "success"
+end
 
 local jsonErrorParse, data = pcall(json.encode,{
     username = "Xodos",
     icon_emoji = ":xodos:",
     attachments = {
         {
-            color = "#36a64f",
+            color = color,
             author_name = data.pull_request.user.login,
             title = "Показать правки",
             title_link = data.pull_request.html_url,
             text = data.pull_request.title,
             fields = {
-                { title = "Deployment success" },
+                { title = "Deployment " .. msg },
             }
         },
     },