fixed the NetDialer syntax and updated the build script

DevoKun · Apr 15, 2018 · 81301e9 · 81301e9
1 parent 823d325
commit 81301e9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/azhealthcheck.go b/azhealthcheck.go
@@ -202,8 +202,7 @@ fmt.Println(out.String())
       netTransport = &http.Transport{
         Dial: (&net.Dialer{
           Timeout:   10 * time.Second,
-          DisableKeepAlives: true,
-          //KeepAlive: 10 * time.Second,
+          KeepAlive: 1 * time.Second,
         }).Dial,
         TLSClientConfig:       tlsConfig, // used for the client ssl cert auth
         TLSHandshakeTimeout:   10 * time.Second,
@@ -216,8 +215,7 @@ fmt.Println(out.String())
       netTransport = &http.Transport{
         Dial: (&net.Dialer{
           Timeout:   10 * time.Second,
-          DisableKeepAlives: true,
-          //KeepAlive: 10 * time.Second,
+          KeepAlive: 1 * time.Second,
         }).Dial,
         TLSHandshakeTimeout:   10 * time.Second,
         ResponseHeaderTimeout: 10 * time.Second,

diff --git a/build.sh b/build.sh
@@ -9,15 +9,19 @@ else
 fi
 
 
-TARGET_OPERATING_SYSTEMS="darwin linux" # windows
+TARGET_OPERATING_SYSTEMS="darwin linux windows"
 TARGET_PLATFORMS="amd64" # i386
 
 for GOOS in $TARGET_OPERATING_SYSTEMS; do
   for GOARCH in $TARGET_PLATFORMS; do
     echo "Building $GOOS-$GOARCH"
     export GOOS=$GOOS
     export GOARCH=$GOARCH
-    go build -o target/${TARGET_FILENAME}-$GOOS-$GOARCH ${TARGET_FILENAME}.go
+    FINAL_FILENAME="target/${TARGET_FILENAME}-$GOOS-$GOARCH"
+    if [ $GOOS == "windows" ]; then
+      FINAL_FILENAME="${FINAL_FILENAME}.exe"
+    fi
+    go build -o $FINAL_FILENAME ${TARGET_FILENAME}.go
   done
 done