chore: move the logging module out of the internal package

yanaren · Jul 10, 2021 · d566061 · d566061
1 parent 1bdd3aa
commit d566061
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/eventloop_unix.go b/eventloop_unix.go
@@ -37,9 +37,9 @@ import (
 
 	gerrors "github.com/panjf2000/gnet/errors"
 	"github.com/panjf2000/gnet/internal/io"
-	"github.com/panjf2000/gnet/internal/logging"
 	"github.com/panjf2000/gnet/internal/netpoll"
 	"github.com/panjf2000/gnet/internal/socket"
+	"github.com/panjf2000/gnet/logging"
 )
 
 type eventloop struct {

diff --git a/eventloop_windows.go b/eventloop_windows.go
@@ -28,10 +28,9 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/panjf2000/gnet/internal/logging"
-	"github.com/panjf2000/gnet/pool/bytebuffer"
-
 	"github.com/panjf2000/gnet/errors"
+	"github.com/panjf2000/gnet/logging"
+	"github.com/panjf2000/gnet/pool/bytebuffer"
 )
 
 type eventloop struct {

diff --git a/gnet.go b/gnet.go
@@ -30,7 +30,7 @@ import (
 
 	"github.com/panjf2000/gnet/errors"
 	"github.com/panjf2000/gnet/internal"
-	"github.com/panjf2000/gnet/internal/logging"
+	"github.com/panjf2000/gnet/logging"
 )
 
 // Action is an action that occurs after the completion of an event.

diff --git a/internal/netpoll/epoll.go b/internal/netpoll/epoll.go
@@ -32,8 +32,8 @@ import (
 	"golang.org/x/sys/unix"
 
 	"github.com/panjf2000/gnet/errors"
-	"github.com/panjf2000/gnet/internal/logging"
 	"github.com/panjf2000/gnet/internal/netpoll/queue"
+	"github.com/panjf2000/gnet/logging"
 )
 
 // Poller represents a poller which is in charge of monitoring file-descriptors.

diff --git a/internal/netpoll/kqueue.go b/internal/netpoll/kqueue.go
@@ -31,8 +31,8 @@ import (
 	"golang.org/x/sys/unix"
 
 	"github.com/panjf2000/gnet/errors"
-	"github.com/panjf2000/gnet/internal/logging"
 	"github.com/panjf2000/gnet/internal/netpoll/queue"
+	"github.com/panjf2000/gnet/logging"
 )
 
 // Poller represents a poller which is in charge of monitoring file-descriptors.

diff --git a/listener_unix.go b/listener_unix.go
@@ -28,11 +28,12 @@ import (
 	"sync"
 	"time"
 
+	"golang.org/x/sys/unix"
+
 	"github.com/panjf2000/gnet/errors"
-	"github.com/panjf2000/gnet/internal/logging"
 	"github.com/panjf2000/gnet/internal/netpoll"
 	"github.com/panjf2000/gnet/internal/socket"
-	"golang.org/x/sys/unix"
+	"github.com/panjf2000/gnet/logging"
 )
 
 type listener struct {

diff --git a/listener_windows.go b/listener_windows.go
@@ -26,8 +26,8 @@ import (
 	"sync"
 
 	"github.com/panjf2000/gnet/errors"
-	"github.com/panjf2000/gnet/internal/logging"
 	"github.com/panjf2000/gnet/internal/netpoll"
+	"github.com/panjf2000/gnet/logging"
 )
 
 type listener struct {

diff --git a/internal/logging/logger.go → logging/logger.go b/internal/logging/logger.go → logging/logger.go
diff --git a/options.go b/options.go
@@ -23,8 +23,9 @@ package gnet
 import (
 	"time"
 
-	"github.com/panjf2000/gnet/internal/logging"
 	"go.uber.org/zap/zapcore"
+
+	"github.com/panjf2000/gnet/logging"
 )
 
 // Option is a function that will set up option.