From 818cf7e7e5e65d403cd46c09cafe2523f5349843 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@eossweden.org>
Date: Fri, 21 Oct 2022 13:13:02 +0200
Subject: [PATCH] move src/helpers.go to src/utils/parse_log_formatter.go

---
 Makefile                                                   | 2 +-
 src/main.go                                                | 3 ++-
 src/{helpers.go => utils/parse_log_formatter.go}           | 4 ++--
 src/{helpers_test.go => utils/parse_log_formatter_test.go} | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)
 rename src/{helpers.go => utils/parse_log_formatter.go} (82%)
 rename src/{helpers_test.go => utils/parse_log_formatter_test.go} (83%)

diff --git a/Makefile b/Makefile
index 8ba2985..38193a2 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ 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 src/helpers.go
+SOURCES=src/main.go src/server.go src/parse_request.go
 
 .PHONY: all build/$(PROGRAM_NAME) clean package_debian
 all: build
diff --git a/src/main.go b/src/main.go
index 35e02c0..b9eb767 100644
--- a/src/main.go
+++ b/src/main.go
@@ -5,6 +5,7 @@ import (
     "os"
     "os/signal"
     "syscall"
+    "github.com/eosswedenorg/eosio-api-healthcheck/src/utils"
     log "github.com/inconshreveable/log15"
     "github.com/eosswedenorg-go/pid"
     "github.com/pborman/getopt/v2"
@@ -148,7 +149,7 @@ func main() {
         return;
     }
 
-    logfmt = parseLogFormatter(*logFormatter)
+    logfmt = utils.ParseLogFormatter(*logFormatter)
 
     // Open logfile.
     if len(logFile) > 0 {
diff --git a/src/helpers.go b/src/utils/parse_log_formatter.go
similarity index 82%
rename from src/helpers.go
rename to src/utils/parse_log_formatter.go
index 6a86a1f..d655e0b 100644
--- a/src/helpers.go
+++ b/src/utils/parse_log_formatter.go
@@ -1,11 +1,11 @@
 
-package main
+package utils
 
 import (
     log "github.com/inconshreveable/log15"
 )
 
-func parseLogFormatter(name string) log.Format {
+func ParseLogFormatter(name string) log.Format {
 
     switch name {
     case "logfmt" :
diff --git a/src/helpers_test.go b/src/utils/parse_log_formatter_test.go
similarity index 83%
rename from src/helpers_test.go
rename to src/utils/parse_log_formatter_test.go
index 760adb4..5a42c90 100644
--- a/src/helpers_test.go
+++ b/src/utils/parse_log_formatter_test.go
@@ -1,4 +1,4 @@
-package main
+package utils
 
 import (
     "reflect"
@@ -7,7 +7,7 @@ import (
 	log "github.com/inconshreveable/log15"
 )
 
-func Test_parseLogFormatter(t *testing.T) {
+func Test_ParseLogFormatter(t *testing.T) {
 	tests := []struct {
 		name string
 		arg  string
@@ -21,7 +21,7 @@ func Test_parseLogFormatter(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := parseLogFormatter(tt.arg); reflect.ValueOf(got).Pointer() != reflect.ValueOf(tt.want).Pointer() {
+			if got := ParseLogFormatter(tt.arg); reflect.ValueOf(got).Pointer() != reflect.ValueOf(tt.want).Pointer() {
 				t.Errorf("parseLogFormatter() = %v, want %v", got, tt.want)
 			}
 		})