Browse Source

fix: get ttlerr

CareyWong 3 years ago
parent
commit
cb43a27848
2 changed files with 11 additions and 11 deletions
  1. 9 9
      Makefile
  2. 2 2
      main.go

+ 9 - 9
Makefile

@@ -10,33 +10,33 @@ BUILD=`date +%FT%T%z`
 
 default:
 	@echo ${BINARY_DEFAULT}
-	@go build -o ${BINARY_DEFAULT} ${GOFILES}
+	@go build -ldflags="-s -w" -o ${BINARY_DEFAULT} ${GOFILES}
 
 all:
 	@echo ${BINARY_LINUX}
-	@CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ${BINARY_LINUX} ${GOFILES}
+	@CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o ${BINARY_LINUX} ${GOFILES}
 	# @echo ${BINARY_DARWIN}
-	# @CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o ${BINARY_DARWIN} ${GOFILES}
+	# @CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -o ${BINARY_DARWIN} ${GOFILES}
 	@echo ${BINARY_WINDOWS}
-	@CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o ${BINARY_WINDOWS} ${GOFILES}
+	@CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" -o ${BINARY_WINDOWS} ${GOFILES}
 	@echo ${BINARY_ARM64}
-	@CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o ${BINARY_ARM64} ${GOFILES}
+	@CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="-s -w" -o ${BINARY_ARM64} ${GOFILES}
 
 linux:
 	@echo ${BINARY_LINUX}
-	@CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ${BINARY_LINUX} ${GOFILES}
+	@CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o ${BINARY_LINUX} ${GOFILES}
 
 darwin:
 	@echo ${BINARY_DARWIN}
-	@CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o ${BINARY_DARWIN} ${GOFILES}
+	@CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -o ${BINARY_DARWIN} ${GOFILES}
 
 windows:
 	@echo ${BINARY_WINDOWS}
-	@CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o ${BINARY_WINDOWS} ${GOFILES}
+	@CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" -o ${BINARY_WINDOWS} ${GOFILES}
 
 aarch64:
 	@echo ${BINARY_ARM64}
-	@CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o ${BINARY_ARM64} ${GOFILES}
+	@CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="-s -w" -o ${BINARY_ARM64} ${GOFILES}
 
 install:
 	@go mod tidy

+ 2 - 2
main.go

@@ -215,8 +215,8 @@ func renew(shortKey string) {
 		_, _ = redisClient.Do("expire", lockKey, defaultRenewal*secondsPerDay)
 
 		// 续命
-		ttl, _ := redis.Int(redisClient.Do("ttl", shortKey))
-		if ttl != -1 {
+		ttl, err := redis.Int(redisClient.Do("ttl", shortKey))
+		if err == nil && ttl != -1 {
 			_, _ = redisClient.Do("expire", shortKey, ttl+defaultRenewal*secondsPerDay)
 		}
 	}