From b0f5dbbf9c6f20b55052254ecbfa78c985f517c6 Mon Sep 17 00:00:00 2001 From: Tai Groot Date: Wed, 29 Dec 2021 14:55:17 -0800 Subject: [PATCH] fix makefile, adjust verbosity --- Makefile | 6 +++--- farmer/main.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f270e9c..a076fcc 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ endif export GitCommit=`git rev-parse HEAD | cut -c -7`;\ export BuildTime=`date -u +%Y%m%d.%H%M%S`;\ export Authors=`git log --format='%aN' | sort -u | sed "s@root@@" | tr '\n' ';' | sed "s@;;@;@g" | sed "s@;@; @g" | sed "s@\(.* \); @\1@" | sed "s@[[:blank:]]@SpAcE@g"`;\ - export GitTag=$$(TAG=`git tag --contains $$(git rev-parse HEAD) | sort -R | tr '\n' ' '`; if [ "$$(printf "$$TAG")" ]; then prin tf "$$TAG"; else printf "undefined"; fi);\ + export GitTag=$$(TAG=`git tag --contains $$(git rev-parse HEAD) | sort -R | tr '\n' ' '`; if [ "$$(printf "$$TAG")" ]; then printf "$$TAG"; else printf "undefined"; fi);\ go build -ldflags "-X main.BuildNo=$$BITBUCKET_BUILD_NUMBER -X main.GitCommit=$$GitCommit -X main.Tag=$$GitTag -X main.BuildTime=$$BuildTime -X main.Authors=$$Authors" -o "bin/sprout" ./sprout/*.go @printf "\e[32mSuccess!\e[39m\n" @@ -44,7 +44,7 @@ endif export GitCommit=`git rev-parse HEAD | cut -c -7`;\ export BuildTime=`date -u +%Y%m%d.%H%M%S`;\ export Authors=`git log --format='%aN' | sort -u | sed "s@root@@" | tr '\n' ';' | sed "s@;;@;@g" | sed "s@;@; @g" | sed "s@\(.* \); @\1@" | sed "s@[[:blank:]]@SpAcE@g"`;\ - export GitTag=$$(TAG=`git tag --contains $$(git rev-parse HEAD) | sort -R | tr '\n' ' '`; if [ "$$(printf "$$TAG")" ]; then prin tf "$$TAG"; else printf "undefined"; fi);\ + export GitTag=$$(TAG=`git tag --contains $$(git rev-parse HEAD) | sort -R | tr '\n' ' '`; if [ "$$(printf "$$TAG")" ]; then printf "$$TAG"; else printf "undefined"; fi);\ go build -ldflags "-X main.BuildNo=$$BITBUCKET_BUILD_NUMBER -X main.GitCommit=$$GitCommit -X main.Tag=$$GitTag -X main.BuildTime=$$BuildTime -X main.Authors=$$Authors" -o "bin/grlx" ./grlx/main.go @printf "\e[32mSuccess!\e[39m\n" @@ -63,7 +63,7 @@ endif export GitCommit=`git rev-parse HEAD | cut -c -7`;\ export BuildTime=`date -u +%Y%m%d.%H%M%S`;\ export Authors=`git log --format='%aN' | sort -u | sed "s@root@@" | tr '\n' ';' | sed "s@;;@;@g" | sed "s@;@; @g" | sed "s@\(.* \); @\1@" | sed "s@[[:blank:]]@SpAcE@g"`;\ - export GitTag=$$(TAG=`git tag --contains $$(git rev-parse HEAD) | sort -R | tr '\n' ' '`; if [ "$$(printf "$$TAG")" ]; then prin tf "$$TAG"; else printf "undefined"; fi);\ + export GitTag=$$(TAG=`git tag --contains $$(git rev-parse HEAD) | sort -R | tr '\n' ' '`; if [ "$$(printf "$$TAG")" ]; then printf "$$TAG"; else printf "undefined"; fi);\ go build -ldflags "-X main.BuildNo=$$BITBUCKET_BUILD_NUMBER -X main.GitCommit=$$GitCommit -X main.Tag=$$GitTag -X main.BuildTime=$$BuildTime -X main.Authors=$$Authors" -o "bin/farmer" ./farmer/main.go @printf "\e[32mSuccess!\e[39m\n" diff --git a/farmer/main.go b/farmer/main.go index 7551eaa..fcd9fe0 100644 --- a/farmer/main.go +++ b/farmer/main.go @@ -27,7 +27,7 @@ import ( func init() { config.LoadConfig("farmer") - log.SetLogLevel(log.LTrace) + log.SetLogLevel(log.LDebug) } var s *nats_server.Server