Merge pull request #903 from FactomProject/FD-1222_atomic_prefix

Fd 1222 atomic prefix
FactomProject · Oct 21, 2019 · de5c619 · de5c619
2 parents bfe12fb + 3eafd46
commit de5c619
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/log/logger_test.go b/log/logger_test.go
@@ -1,8 +1,9 @@
 package log_test
 
 import (
-	"github.com/FactomProject/factomd/log"
 	"testing"
+
+	"github.com/FactomProject/factomd/log"
 )
 
 func TestLogPrintf(t *testing.T) {

diff --git a/netTest/AnElection_test.go b/netTest/AnElection_test.go
@@ -1,8 +1,9 @@
 package nettest
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestAnElection(t *testing.T) {

diff --git a/netTest/DebugApi_test.go b/netTest/DebugApi_test.go
@@ -1,8 +1,9 @@
 package nettest
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestDebugAPI(t *testing.T) {

diff --git a/netTest/testHelper.go b/netTest/testHelper.go
@@ -4,12 +4,13 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/FactomProject/factomd/p2p"
-	"github.com/FactomProject/factomd/state"
-	"github.com/FactomProject/factomd/testHelper"
 	"io/ioutil"
 	"net/http"
 	"testing"
+
+	"github.com/FactomProject/factomd/p2p"
+	"github.com/FactomProject/factomd/state"
+	"github.com/FactomProject/factomd/testHelper"
 )
 
 type remoteNode struct {

diff --git a/simTest/InitDevNet_test.go b/simTest/InitDevNet_test.go
@@ -1,8 +1,9 @@
 package simtest
 
 import (
-	. "github.com/FactomProject/factomd/testHelper"
 	"testing"
+
+	. "github.com/FactomProject/factomd/testHelper"
 )
 
 // create Stub DBs & configs for DevNet Testing

diff --git a/simTest/factomd_test.go b/simTest/factomd_test.go
@@ -5,7 +5,6 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"github.com/FactomProject/factomd/log"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -15,6 +14,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/FactomProject/factomd/log"
+
 	"github.com/FactomProject/factomd/common/constants"
 	"github.com/FactomProject/factomd/common/directoryBlock"
 	"github.com/FactomProject/factomd/common/messages"

diff --git a/util/atomic/atomic.go b/util/atomic/atomic.go
@@ -110,18 +110,12 @@ func Goid() string {
 	return idField
 }
 
-// don't try to remove prefix if caller func is shorter
-func truncate(fn string) string {
-	if len(fn) > prefix {
-		return fn[prefix:]
-	} else {
-		return fn
-	}
-}
-
 func WhereAmIString(depth int) string {
 	_, fn, line, _ := runtime.Caller(depth + 1)
-	return fmt.Sprintf("%v-%s:%d", Goid(), truncate(fn), line)
+	if len(fn) > prefix {
+		fn = fn[prefix:] // Chop off the /home/user/go/src...factomd/ part of the path.
+	}
+	return fmt.Sprintf("%v-%s:%d", Goid(), fn, line)
 }
 
 func WhereAmIMsg(msg string) {