From b93f56f05c20ba715bb6a60695364321d156f26a Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 4 Jan 2022 09:54:34 +0100 Subject: [PATCH] Convert hard tabs to soft. --- compile.sh | 94 +++++++++++++++++++++--------------------- src/cmd/main.go | 106 ++++++++++++++++++++++++------------------------ 2 files changed, 100 insertions(+), 100 deletions(-) diff --git a/compile.sh b/compile.sh index 5b09b0c..8db2521 100755 --- a/compile.sh +++ b/compile.sh @@ -5,19 +5,19 @@ SYSTEMS=( windows linux freebsd ) ARCHS=( 386 amd64 amd64p32 arm arm64 ) function usage() { - echo "Usage: ${0##*/} [ -h|--help ] [ --target ] [ -a|--arch ] [ -p|--package ]" - echo "" - echo " Valid systems:" - for i in "${SYSTEMS[@]}"; do - echo " * ${i}" - done - echo "" - echo " Valid architectures:" - for i in "${ARCHS[@]}"; do - echo " * ${i}" - done - echo "" - exit 1 + echo "Usage: ${0##*/} [ -h|--help ] [ --target ] [ -a|--arch ] [ -p|--package ]" + echo "" + echo " Valid systems:" + for i in "${SYSTEMS[@]}"; do + echo " * ${i}" + done + echo "" + echo " Valid architectures:" + for i in "${ARCHS[@]}"; do + echo " * ${i}" + done + echo "" + exit 1 } options=$(getopt -n "${0##*/}" -o "ht:a:p" -l "help,target:,arch:,package" -- "$@") @@ -30,47 +30,47 @@ MAKE_TARGET="all" while true; do - case $1 in - -p|--package) - MAKE_TARGET="package_deb" - ;; - -t|--target) - shift - REGEX=$(echo "${SYSTEMS[@]}" | sed 's/[[:space:]]/|/g') - [[ ! "$1" =~ ^($REGEX)$ ]] && { - echo "Incorrect system '$1' provided" - usage - } - export GOOS=$1 - ;; - -a|--arch) - shift - REGEX=$(echo "${ARCHS[@]}" | sed 's/[[:space:]]/|/g') - [[ ! "$1" =~ ^($REGEX)$ ]] && { - echo "Incorrect architecture '$1' provided" - usage - } - export GOARCH=$1 - ;; - -h|--help) usage ;; - --) shift - break - ;; - esac - shift + case $1 in + -p|--package) + MAKE_TARGET="package_deb" + ;; + -t|--target) + shift + REGEX=$(echo "${SYSTEMS[@]}" | sed 's/[[:space:]]/|/g') + [[ ! "$1" =~ ^($REGEX)$ ]] && { + echo "Incorrect system '$1' provided" + usage + } + export GOOS=$1 + ;; + -a|--arch) + shift + REGEX=$(echo "${ARCHS[@]}" | sed 's/[[:space:]]/|/g') + [[ ! "$1" =~ ^($REGEX)$ ]] && { + echo "Incorrect architecture '$1' provided" + usage + } + export GOARCH=$1 + ;; + -h|--help) usage ;; + --) shift + break + ;; + esac + shift done MESSAGE="" if [ ! -z "${GOOS}" ]; then - # Hack to select the right package :) - if [ "${MAKE_TARGET}" == "package_deb" ] && [ "${GOOS}" == "freebsd" ]; then - MAKE_TARGET="package_freebsd" - fi - MESSAGE="[\e[34m::\e[0m] Crosscompiling for: ${GOOS}" + # Hack to select the right package :) + if [ "${MAKE_TARGET}" == "package_deb" ] && [ "${GOOS}" == "freebsd" ]; then + MAKE_TARGET="package_freebsd" + fi + MESSAGE="[\e[34m::\e[0m] Crosscompiling for: ${GOOS}" fi if [ ! -z "${GOARCH}" ]; then - MESSAGE="${MESSAGE} (${GOARCH})" + MESSAGE="${MESSAGE} (${GOARCH})" fi diff --git a/src/cmd/main.go b/src/cmd/main.go index 2d0cfa5..1f8af8d 100644 --- a/src/cmd/main.go +++ b/src/cmd/main.go @@ -2,69 +2,69 @@ package main import ( - "fmt" - "strings" - log "github.com/inconshreveable/log15" - "github.com/pborman/getopt/v2" - "github.com/onrik/ethrpc" - "github.com/eosswedenorg-go/haproxy" - "github.com/eosswedenorg-go/tcp_server" + "fmt" + "strings" + log "github.com/inconshreveable/log15" + "github.com/pborman/getopt/v2" + "github.com/onrik/ethrpc" + "github.com/eosswedenorg-go/haproxy" + "github.com/eosswedenorg-go/tcp_server" ) var logger log.Logger func onConnect(c *tcp_server.Client) { - logger.Info("Client connected", "addr", c.Addr.String()) + logger.Info("Client connected", "addr", c.Addr.String()) } func onTcpMessage(c *tcp_server.Client, message string) { - status := haproxy.HealthCheckDown - client := ethrpc.New(strings.TrimSpace(message)) + status := haproxy.HealthCheckDown + client := ethrpc.New(strings.TrimSpace(message)) - resp, err := client.EthSyncing() - if err == nil { - if resp.IsSyncing == false { - status = haproxy.HealthCheckUp - } - } else { - logger.Warn(err.Error()) - } + resp, err := client.EthSyncing() + if err == nil { + if resp.IsSyncing == false { + status = haproxy.HealthCheckUp + } + } else { + logger.Warn(err.Error()) + } - logger.Info("Node status", "status", status) + logger.Info("Node status", "status", status) - // Report status to HAproxy - c.WriteString(fmt.Sprintln(status)) - c.Close() + // Report status to HAproxy + c.WriteString(fmt.Sprintln(status)) + c.Close() } func onDisconnect(c *tcp_server.Client, err error) { - if err == nil { - logger.Info("Client disconnected", "addr", c.Addr.String()) - } else { - logger.Warn("Client disconnected", "addr", c.Addr.String(), "err", err) - } + if err == nil { + logger.Info("Client disconnected", "addr", c.Addr.String()) + } else { + logger.Warn("Client disconnected", "addr", c.Addr.String(), "err", err) + } } func argv_listen_addr() string { - var addr string + var addr string - argv := getopt.Args() - if len(argv) > 0 { - addr = argv[0] - } else { - addr = "127.0.0.1" - } + argv := getopt.Args() + if len(argv) > 0 { + addr = argv[0] + } else { + addr = "127.0.0.1" + } - addr += ":" - if len(argv) > 1 { - addr += argv[1] - } else { - addr += "1301" - } + addr += ":" + if len(argv) > 1 { + addr += argv[1] + } else { + addr += "1301" + } - return addr + return addr } func main() { @@ -76,7 +76,7 @@ func main() { getopt.FlagLong(&printUsage, "help", 'h', "Print this help text") getopt.FlagLong(&printVersion, "version", 'v', "Print version") - getopt.Parse() + getopt.Parse() if printUsage { getopt.Usage() @@ -90,19 +90,19 @@ func main() { logger = log.New() - addr := argv_listen_addr() - server := tcp_server.New(argv_listen_addr()) + addr := argv_listen_addr() + server := tcp_server.New(argv_listen_addr()) - logger.Info(fmt.Sprintf("Listening on: %s", addr)) + logger.Info(fmt.Sprintf("Listening on: %s", addr)) - // TCP Client sends message. - server.OnConnect(onConnect) - server.OnMessage(onTcpMessage) - server.OnDisconnect(onDisconnect) + // TCP Client sends message. + server.OnConnect(onConnect) + server.OnMessage(onTcpMessage) + server.OnDisconnect(onDisconnect) - err := server.Listen() + err := server.Listen() - if err != nil { - logger.Error(err.Error()) - } + if err != nil { + logger.Error(err.Error()) + } }