Refactor: move internal package from src/ to internal/ and move src/main.go to cmd/eosio-api-healthcheck/main.go

Makefile

@@ -11,14 +11,12 @@ GOBUILDFLAGS  = -v -ldflags='-v -s -w -X main.VersionString=$(PROGRAM_VERSION)'
 DPKG_BUILDPACKAGE = dpkg-buildpackage
 DPKG_BUILDPACKAGE_FLAGS = -b -uc
 
-SOURCES=src/main.go src/server.go src/parse_request.go
-
 .PHONY: all build/$(PROGRAM_NAME) clean package_debian
 all: build
 build: build/$(PROGRAM_NAME)
 
 build/$(PROGRAM_NAME) : $(SOURCES)
-	$(GO) build -o $@ $(GOBUILDFLAGS) $^
+	$(GO) build -o $@ $(GOBUILDFLAGS) cmd/eosio-api-healtcheck/main.go
 
 test:
 	$(GO) test -v ./...

cmd/eosio-api-healtcheck/main.go

@@ -5,7 +5,8 @@ import (
     "os"
     "os/signal"
     "syscall"
-    "github.com/eosswedenorg/eosio-api-healthcheck/src/utils"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal/utils"
     log "github.com/inconshreveable/log15"
     "github.com/eosswedenorg-go/pid"
     "github.com/pborman/getopt/v2"
@@ -127,7 +128,7 @@ func main() {
     var addr string
     var logFormatter *string
 
-    logger = log.New()
+    logger = log.Root()
 
     // Command line parsing
     getopt.SetParameters("[ip] [port]")
@@ -171,7 +172,7 @@ func main() {
     addr = argv_listen_addr()
 
     // Start listening to TCP Connections
-    err := spawnTcpServer(addr)
+    err := internal.SpawnTcpServer(addr)
     if err == nil {
         logger.Info("TCP Server started", "addr", addr)
 

internal/api/eosio_contract.go

@@ -3,7 +3,7 @@ package api
 
 import (
     "fmt"
-    "github.com/eosswedenorg/eosio-api-healthcheck/src/utils"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal/utils"
     "github.com/eosswedenorg-go/haproxy/agentcheck"
     contract_api "github.com/eosswedenorg-go/eos-contract-api-client"
 )

internal/api/eosio_v1.go

@@ -3,7 +3,7 @@ package api
 
 import (
     "fmt"
-    "github.com/eosswedenorg/eosio-api-healthcheck/src/utils"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal/utils"
     "github.com/eosswedenorg-go/haproxy/agentcheck"
     "github.com/eosswedenorg-go/eosapi"
 )

internal/api/eosio_v2.go

@@ -3,7 +3,7 @@ package api
 
 import (
     "fmt"
-    "github.com/eosswedenorg/eosio-api-healthcheck/src/utils"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal/utils"
     "github.com/eosswedenorg-go/haproxy/agentcheck"
     "github.com/eosswedenorg-go/eosapi"
 )

internal/parse_request.go

@@ -1,11 +1,11 @@
 
-package main
+package internal
 
 import (
     "strings"
     "fmt"
     "strconv"
-    "github.com/eosswedenorg/eosio-api-healthcheck/src/api"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal/api"
 )
 
 func ParseArguments(args []string) api.ApiArguments {

internal/parse_request_test.go

@@ -1,11 +1,11 @@
 
-package main
+package internal
 
 import (
     // "fmt"
     "testing"
     "github.com/stretchr/testify/assert"
-    "github.com/eosswedenorg/eosio-api-healthcheck/src/api"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal/api"
 )
 
 func TestParseWithInvalidApi(t *testing.T) {

internal/server.go

@@ -1,8 +1,9 @@
-package main
+package internal
 
 import (
     "strings"
-    "github.com/eosswedenorg/eosio-api-healthcheck/src/api"
+    log "github.com/inconshreveable/log15"
+    "github.com/eosswedenorg/eosio-api-healthcheck/internal/api"
     "github.com/eosswedenorg-go/haproxy/agentcheck"
     "github.com/eosswedenorg-go/tcp_server"
 )
@@ -12,6 +13,8 @@ import (
 
 func onTcpMessage(c *tcp_server.Client, args string) {
 
+    logger := log.Root()
+
     // Check api.
     // -------------------
     healthCheckApi, err := ParseRequest(args)
@@ -39,10 +42,10 @@ func onTcpMessage(c *tcp_server.Client, args string) {
     c.Close()
 }
 
-//  spawnTcpServer
+//  SpawnTcpServer
 // ---------------------------------------------------------
 
-func spawnTcpServer(addr string) error {
+func SpawnTcpServer(addr string) error {
     server := tcp_server.New(addr)
     server.OnMessage(onTcpMessage)