short refactor

Author: incu6us

Makefile

@@ -1,7 +1,7 @@
 
-.PHONY: all test build build-linux-amd64 build-osx-amd64 build-windows-amd64 build-win-386
+.PHONY: all test build build-linux-x86_64 build-linux-x86 build-osx-x86_64 build-osx-x86 build-win-x86_64 build-win-x86
 
-all: test build build-linux-amd64 build-osx-amd64 build-windows-amd64 build-win-386
+all: test build build-linux-x86_64 build-linux-x86 build-osx-x86_64 build-osx-x86 build-win-x86_64 build-win-x86
 
 test:
 	@echo "Running tests"
@@ -11,26 +11,26 @@ build:
 	@echo "Building"
 	@go build -o gtw
 
-build-linux-amd64:
-	@echo "Building linux-amd64 version"
-	@GOOS=linux GOARCH=amd64 go build -o gtw-linux-amd64
+build-linux-x86_64:
+	@echo "Building linux-x86_64 version"
+	@GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a -tags netgo -installsuffix netgo -o gtw-linux-x86_64
 
-build-linux-386:
-	@echo "Building linux-386 version"
-	@GOOS=linux GOARCH=386 go build -o gtw-linux-386
+build-linux-x86:
+	@echo "Building linux-x86 version"
+	@GOOS=linux GOARCH=386 CGO_ENABLED=0 go build -a -tags netgo -installsuffix netgo -o gtw-linux-x86
 
-build-osx-amd64:
-	@echo "Building osx-amd64 version"
-	@GOOS=darwin GOARCH=amd64 go build -o gtw-osx-amd64
+build-osx-x86_64:
+	@echo "Building osx-x86_64 version"
+	@GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -a -tags netgo -installsuffix netgo -o gtw-osx-x86_64
 
-build-osx-386:
-	@echo "Building osx-386 version"
-	@GOOS=darwin GOARCH=386 go build -o gtw-osx-386
+build-osx-x86:
+	@echo "Building osx-x86 version"
+	@GOOS=darwin GOARCH=386 CGO_ENABLED=0 go build -a -tags netgo -installsuffix netgo -o gtw-osx-x86
 
-build-windows-amd64:
-	@echo "Building windows-amd64 version"
-	@GOOS=darwin GOARCH=amd64 go build -o gtw-win-amd64.exe
+build-win-x86_64:
+	@echo "Building win-x86_64 version"
+	@GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -a -tags netgo -installsuffix netgo -o gtw-win-x86_64.exe
 
-build-win-386:
-	@echo "Building win-386 version"
-	@GOOS=darwin GOARCH=386 go build -o gtw-win-386.exe
+build-win-x86:
+	@echo "Building win-x86 version"
+	@GOOS=darwin GOARCH=386 CGO_ENABLED=0 go build -a -tags netgo -installsuffix netgo -o gtw-win-x86.exe

main.go

@@ -8,17 +8,18 @@ import (
 	"time"
 
 	"github.com/EGT-Ukraine/gitlab-trigger-watcher/models"
-
 	"github.com/EGT-Ukraine/gitlab-trigger-watcher/trigger"
 	"github.com/urfave/cli"
 )
 
 const (
-	waitTimeout      = 10 * time.Minute
+	lifecycleTimeout = 10 * time.Minute
 	thresholdTimeout = 2 * time.Second
 )
 
 func main() {
+	go shutdownSignalReceiver()
+
 	app := cli.App{
 		Flags: []cli.Flag{
 			cli.BoolFlag{
@@ -89,9 +90,8 @@ func main() {
 					}
 
 					go func() {
-						shutdown()
-						time.Sleep(waitTimeout)
-						os.Exit(1)
+						time.Sleep(lifecycleTimeout)
+						log.Fatalf("lifecycle time(%v) has been expired", lifecycleTimeout)
 					}()
 
 					var previousPipelineStatus models.PipelineStatus
@@ -129,7 +129,7 @@ func main() {
 	}
 }
 
-func shutdown() {
+func shutdownSignalReceiver() {
 	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, syscall.SIGTERM, syscall.SIGINT)
 	<-quit

models/create_pipeline.go renamed to models/models.go

@@ -1,5 +1,14 @@
 package models
 
+type PipelineStatus string
+
+const (
+	Running PipelineStatus = "running"
+	Pending                = "pending"
+	Failed                 = "failed"
+	Success                = "success"
+)
+
 type CreatePipelineResponse struct {
 	BeforeSha   string      `json:"before_sha"`
 	CommittedAt interface{} `json:"committed_at"`
@@ -25,3 +34,11 @@ type CreatePipelineResponse struct {
 	WebURL     string      `json:"web_url"`
 	YamlErrors interface{} `json:"yaml_errors"`
 }
+
+type PipelineStatusResponse struct {
+	ID     int64          `json:"id"`
+	Ref    string         `json:"ref"`
+	Sha    string         `json:"sha"`
+	Status PipelineStatus `json:"status"`
+	WebURL string         `json:"web_url"`
+}