internal, log: remove code for old unsupported go-versions (#28090)

ethereum · Sep 13, 2023 · 43df612 · 43df612
1 parent 766272f
commit 43df612
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 114 deletions.
diff --git a/internal/debug/loudpanic.go b/internal/debug/loudpanic.go
@@ -14,9 +14,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-//go:build go1.6
-// +build go1.6
-
 package debug
 
 import "runtime/debug"

diff --git a/internal/debug/loudpanic_fallback.go b/internal/debug/loudpanic_fallback.go
diff --git a/internal/debug/trace.go b/internal/debug/trace.go
@@ -14,9 +14,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-//go:build go1.5
-// +build go1.5
-
 package debug
 
 import (

diff --git a/internal/debug/trace_fallback.go b/internal/debug/trace_fallback.go
diff --git a/log/handler.go b/log/handler.go
@@ -7,6 +7,7 @@ import (
 	"os"
 	"reflect"
 	"sync"
+	"sync/atomic"
 
 	"github.com/go-stack/stack"
 )
@@ -354,3 +355,21 @@ func (m muster) FileHandler(path string, fmtr Format) Handler {
 func (m muster) NetHandler(network, addr string, fmtr Format) Handler {
 	return must(NetHandler(network, addr, fmtr))
 }
+
+// swapHandler wraps another handler that may be swapped out
+// dynamically at runtime in a thread-safe fashion.
+type swapHandler struct {
+	handler atomic.Value
+}
+
+func (h *swapHandler) Log(r *Record) error {
+	return (*h.handler.Load().(*Handler)).Log(r)
+}
+
+func (h *swapHandler) Swap(newHandler Handler) {
+	h.handler.Store(&newHandler)
+}
+
+func (h *swapHandler) Get() Handler {
+	return *h.handler.Load().(*Handler)
+}
diff --git a/log/handler_go13.go b/log/handler_go13.go
diff --git a/log/handler_go14.go b/log/handler_go14.go