From 59bd699065faceb6159e613c97d1b41860fefe96 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@eossweden.org>
Date: Mon, 3 Jan 2022 12:05:10 +0100
Subject: [PATCH] Replace local pid module with the one located at
 github.com/eosswedenorg-go/pid

---
 go.mod         |  8 +++-----
 go.sum         |  2 ++
 src/main.go    |  4 ++--
 src/pid/go.mod |  3 ---
 src/pid/pid.go | 28 ----------------------------
 5 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 src/pid/go.mod
 delete mode 100644 src/pid/pid.go

diff --git a/go.mod b/go.mod
index 58c95df..c115674 100644
--- a/go.mod
+++ b/go.mod
@@ -5,11 +5,11 @@ go 1.14
 require (
 	internal/eosapi v1.0.0
 	internal/log v1.0.0
-	internal/pid v1.0.0
 	internal/utils v1.0.0
 
-    github.com/eosswedenorg-go/haproxy v0.0.0-20220101140534-fccfdd93a8cd
-    github.com/firstrow/tcp_server v0.1.0
+	github.com/eosswedenorg-go/pid v1.0.0
+	github.com/eosswedenorg-go/haproxy v0.0.0-20220101140534-fccfdd93a8cd
+	github.com/firstrow/tcp_server v0.1.0
 	github.com/pborman/getopt/v2 v2.1.0
 )
 
@@ -17,6 +17,4 @@ replace internal/eosapi => ./src/eosapi
 
 replace internal/log => ./src/log
 
-replace internal/pid => ./src/pid
-
 replace internal/utils => ./src/utils
diff --git a/go.sum b/go.sum
index 91fbc33..7e234fe 100644
--- a/go.sum
+++ b/go.sum
@@ -3,6 +3,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/eosswedenorg-go/haproxy v0.0.0-20220101140534-fccfdd93a8cd h1:e59v3HnnG60uE50OtziOxyiSNDADr1lDbzn33btn3yE=
 github.com/eosswedenorg-go/haproxy v0.0.0-20220101140534-fccfdd93a8cd/go.mod h1:l5DTEb0dcTZyATo2cuaYQPqwBRuzDw0UgupNo8SAgXo=
+github.com/eosswedenorg-go/pid v1.0.0 h1:k1ra19cgWBHnX5gWQq+eUhNHIjT7hdhsYGp+Ovfvd2U=
+github.com/eosswedenorg-go/pid v1.0.0/go.mod h1:c9nVBDmo8pa3dVjrZjDUN4/DT1ChmfuCWXt6lHsagRc=
 github.com/firstrow/tcp_server v0.1.0 h1:SeaKjoPUqSgwb8NLbXtcWEQS1H+QZ2hwPBBLd1TnGo4=
 github.com/firstrow/tcp_server v0.1.0/go.mod h1:Yw3e670k1AHRzhd+WrOEvXLCMh5NDH01Kc/o0QR1GVQ=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
diff --git a/src/main.go b/src/main.go
index aa87868..26f3965 100644
--- a/src/main.go
+++ b/src/main.go
@@ -6,7 +6,7 @@ import (
 	"os/signal"
 	"syscall"
 	"internal/log"
-	"internal/pid"
+	"github.com/eosswedenorg-go/pid"
 	"github.com/pborman/getopt/v2"
 )
 
@@ -130,7 +130,7 @@ func main() {
 
 	if len(pidFile) > 0 {
 		log.Info("Writing pidfile: %s", pidFile)
-		_, err := pid.Save(pidFile)
+		err := pid.Save(pidFile)
 		if err != nil {
 			log.Error("Failed to write pidfile: %v", err)
 		}
diff --git a/src/pid/go.mod b/src/pid/go.mod
deleted file mode 100644
index 7063d2c..0000000
--- a/src/pid/go.mod
+++ /dev/null
@@ -1,3 +0,0 @@
-module internal/pid
-
-go 1.14
diff --git a/src/pid/pid.go b/src/pid/pid.go
deleted file mode 100644
index b04d78e..0000000
--- a/src/pid/pid.go
+++ /dev/null
@@ -1,28 +0,0 @@
-
-package pid
-
-import (
-	"os"
-	"strconv"
-)
-
-func Get() (int) {
-	return os.Getpid()
-}
-
-func Save(path string) (int, error) {
-
-	pid := Get()
-	fd, err := os.Create(path)
-	if err != nil {
-    	return -1, err
-	}
-
-	_, err = fd.WriteString(strconv.Itoa(pid))
-
-	if err != nil {
-		return -1, err
-	}
-
-	return pid, nil
-}