diff --git a/compose/compose.go b/compose/compose.go index 51669b6ff..8607b36f9 100644 --- a/compose/compose.go +++ b/compose/compose.go @@ -14,10 +14,10 @@ import ( "github.com/cortezaproject/corteza-server/compose/internal/service" "github.com/cortezaproject/corteza-server/compose/rest" "github.com/cortezaproject/corteza-server/internal/db" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/pkg/api" "github.com/cortezaproject/corteza-server/pkg/cli" "github.com/cortezaproject/corteza-server/pkg/cli/flags" + "github.com/cortezaproject/corteza-server/pkg/logger" ) const ( diff --git a/compose/internal/repository/main_test.go b/compose/internal/repository/main_test.go index 0a7686baa..7e5bc3180 100644 --- a/compose/internal/repository/main_test.go +++ b/compose/internal/repository/main_test.go @@ -10,7 +10,7 @@ import ( "github.com/titpetric/factory" "go.uber.org/zap/zapcore" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" ) func TestMain(m *testing.M) { diff --git a/compose/internal/service/attachment.go b/compose/internal/service/attachment.go index c87dcd644..e0718967f 100644 --- a/compose/internal/service/attachment.go +++ b/compose/internal/service/attachment.go @@ -20,8 +20,8 @@ import ( "github.com/cortezaproject/corteza-server/compose/internal/repository" "github.com/cortezaproject/corteza-server/compose/types" "github.com/cortezaproject/corteza-server/internal/auth" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/internal/store" + "github.com/cortezaproject/corteza-server/pkg/logger" ) const ( diff --git a/compose/internal/service/main_test.go b/compose/internal/service/main_test.go index dcebb99b1..87079635e 100644 --- a/compose/internal/service/main_test.go +++ b/compose/internal/service/main_test.go @@ -14,8 +14,8 @@ import ( composeMigrate "github.com/cortezaproject/corteza-server/compose/db" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/internal/test" + "github.com/cortezaproject/corteza-server/pkg/logger" ) type ( diff --git a/compose/internal/service/service.go b/compose/internal/service/service.go index 96d498aeb..e9ccc7e06 100644 --- a/compose/internal/service/service.go +++ b/compose/internal/service/service.go @@ -7,9 +7,9 @@ import ( "go.uber.org/zap" "github.com/cortezaproject/corteza-server/compose/internal/repository" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/internal/store" + "github.com/cortezaproject/corteza-server/pkg/logger" ) type ( diff --git a/compose/rest/handlers/attachment.go b/compose/rest/handlers/attachment.go index 0c73bed23..b8e283345 100644 --- a/compose/rest/handlers/attachment.go +++ b/compose/rest/handlers/attachment.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" "github.com/cortezaproject/corteza-server/compose/rest/request" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/compose/rest/handlers/chart.go b/compose/rest/handlers/chart.go index 123283ee3..4f1c0527b 100644 --- a/compose/rest/handlers/chart.go +++ b/compose/rest/handlers/chart.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" "github.com/cortezaproject/corteza-server/compose/rest/request" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/compose/rest/handlers/module.go b/compose/rest/handlers/module.go index bbe30cdac..5fff36c8e 100644 --- a/compose/rest/handlers/module.go +++ b/compose/rest/handlers/module.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" "github.com/cortezaproject/corteza-server/compose/rest/request" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/compose/rest/handlers/namespace.go b/compose/rest/handlers/namespace.go index 34e6d2a0a..248c5a968 100644 --- a/compose/rest/handlers/namespace.go +++ b/compose/rest/handlers/namespace.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" "github.com/cortezaproject/corteza-server/compose/rest/request" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/compose/rest/handlers/notification.go b/compose/rest/handlers/notification.go index 0673599d4..1822cdcfb 100644 --- a/compose/rest/handlers/notification.go +++ b/compose/rest/handlers/notification.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" "github.com/cortezaproject/corteza-server/compose/rest/request" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/compose/rest/handlers/page.go b/compose/rest/handlers/page.go index 0c431513b..4b7cf6da3 100644 --- a/compose/rest/handlers/page.go +++ b/compose/rest/handlers/page.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" "github.com/cortezaproject/corteza-server/compose/rest/request" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/compose/rest/handlers/permissions.go b/compose/rest/handlers/permissions.go index 1ab8cb3ef..c9b186a1a 100644 --- a/compose/rest/handlers/permissions.go +++ b/compose/rest/handlers/permissions.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" "github.com/cortezaproject/corteza-server/compose/rest/request" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/compose/rest/handlers/record.go b/compose/rest/handlers/record.go index 88fc8869b..5edcfdf39 100644 --- a/compose/rest/handlers/record.go +++ b/compose/rest/handlers/record.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" "github.com/cortezaproject/corteza-server/compose/rest/request" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/compose/rest/handlers/trigger.go b/compose/rest/handlers/trigger.go index 4000f4a54..76e258e92 100644 --- a/compose/rest/handlers/trigger.go +++ b/compose/rest/handlers/trigger.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" "github.com/cortezaproject/corteza-server/compose/rest/request" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/messaging/internal/service/attachment.go b/messaging/internal/service/attachment.go index c7ffa3207..e61bcdd1c 100644 --- a/messaging/internal/service/attachment.go +++ b/messaging/internal/service/attachment.go @@ -17,10 +17,10 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/internal/store" "github.com/cortezaproject/corteza-server/messaging/internal/repository" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/logger" ) const ( diff --git a/messaging/internal/service/main_test.go b/messaging/internal/service/main_test.go index c67e17baa..3940a4998 100644 --- a/messaging/internal/service/main_test.go +++ b/messaging/internal/service/main_test.go @@ -11,8 +11,8 @@ import ( "github.com/titpetric/factory" "go.uber.org/zap/zapcore" - "github.com/cortezaproject/corteza-server/internal/logger" messagingMigrate "github.com/cortezaproject/corteza-server/messaging/db" + "github.com/cortezaproject/corteza-server/pkg/logger" ) type mockDB struct{} diff --git a/messaging/internal/service/service.go b/messaging/internal/service/service.go index 903a5b43b..2a90f3ef1 100644 --- a/messaging/internal/service/service.go +++ b/messaging/internal/service/service.go @@ -7,10 +7,10 @@ import ( "go.uber.org/zap" "github.com/cortezaproject/corteza-server/internal/http" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/internal/store" "github.com/cortezaproject/corteza-server/messaging/internal/repository" + "github.com/cortezaproject/corteza-server/pkg/logger" ) type ( diff --git a/messaging/messaging.go b/messaging/messaging.go index a69972094..ff8dc39e8 100644 --- a/messaging/messaging.go +++ b/messaging/messaging.go @@ -11,7 +11,6 @@ import ( "go.uber.org/zap" "github.com/cortezaproject/corteza-server/internal/db" - "github.com/cortezaproject/corteza-server/internal/logger" migrate "github.com/cortezaproject/corteza-server/messaging/db" "github.com/cortezaproject/corteza-server/messaging/internal/service" "github.com/cortezaproject/corteza-server/messaging/rest" @@ -19,6 +18,7 @@ import ( "github.com/cortezaproject/corteza-server/pkg/api" "github.com/cortezaproject/corteza-server/pkg/cli" "github.com/cortezaproject/corteza-server/pkg/cli/flags" + "github.com/cortezaproject/corteza-server/pkg/logger" ) const ( diff --git a/messaging/rest/handlers/activity.go b/messaging/rest/handlers/activity.go index 8d90906bb..0753d1f5c 100644 --- a/messaging/rest/handlers/activity.go +++ b/messaging/rest/handlers/activity.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/messaging/rest/handlers/attachment.go b/messaging/rest/handlers/attachment.go index 42ddd1df5..548eb08c4 100644 --- a/messaging/rest/handlers/attachment.go +++ b/messaging/rest/handlers/attachment.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/messaging/rest/handlers/channel.go b/messaging/rest/handlers/channel.go index 528b7bef2..2c22ddbcd 100644 --- a/messaging/rest/handlers/channel.go +++ b/messaging/rest/handlers/channel.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/messaging/rest/handlers/commands.go b/messaging/rest/handlers/commands.go index df433f934..83f9ee7bf 100644 --- a/messaging/rest/handlers/commands.go +++ b/messaging/rest/handlers/commands.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/messaging/rest/handlers/message.go b/messaging/rest/handlers/message.go index c76c1a763..a433c50df 100644 --- a/messaging/rest/handlers/message.go +++ b/messaging/rest/handlers/message.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/messaging/rest/handlers/permissions.go b/messaging/rest/handlers/permissions.go index cdeebf5ed..9e41fc3d6 100644 --- a/messaging/rest/handlers/permissions.go +++ b/messaging/rest/handlers/permissions.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/messaging/rest/handlers/search.go b/messaging/rest/handlers/search.go index 7f13e00df..0ecd852aa 100644 --- a/messaging/rest/handlers/search.go +++ b/messaging/rest/handlers/search.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/messaging/rest/handlers/status.go b/messaging/rest/handlers/status.go index 77351c500..22c1bd158 100644 --- a/messaging/rest/handlers/status.go +++ b/messaging/rest/handlers/status.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/messaging/rest/handlers/webhooks.go b/messaging/rest/handlers/webhooks.go index 107b81ffa..4b75a392a 100644 --- a/messaging/rest/handlers/webhooks.go +++ b/messaging/rest/handlers/webhooks.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/messaging/rest/handlers/webhooks_public.go b/messaging/rest/handlers/webhooks_public.go index 905eca29c..bf254db72 100644 --- a/messaging/rest/handlers/webhooks_public.go +++ b/messaging/rest/handlers/webhooks_public.go @@ -17,14 +17,13 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/messaging/rest/request" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Internal API interface diff --git a/messaging/websocket/router.go b/messaging/websocket/router.go index 56d363302..5b7cd22d7 100644 --- a/messaging/websocket/router.go +++ b/messaging/websocket/router.go @@ -7,9 +7,9 @@ import ( "github.com/go-chi/chi" "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/messaging/internal/repository" "github.com/cortezaproject/corteza-server/messaging/internal/service" + "github.com/cortezaproject/corteza-server/pkg/logger" ) func middlewareAllowedAccess(next http.Handler) http.Handler { diff --git a/messaging/websocket/session.go b/messaging/websocket/session.go index 36ac0d720..492725acf 100644 --- a/messaging/websocket/session.go +++ b/messaging/websocket/session.go @@ -11,11 +11,11 @@ import ( "go.uber.org/zap/zapcore" "github.com/cortezaproject/corteza-server/internal/auth" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/internal/payload" "github.com/cortezaproject/corteza-server/internal/payload/outgoing" "github.com/cortezaproject/corteza-server/messaging/internal/service" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/logger" ) type ( diff --git a/messaging/websocket/session_outgoing.go b/messaging/websocket/session_outgoing.go index 55f57bb4a..bb9d5d756 100644 --- a/messaging/websocket/session_outgoing.go +++ b/messaging/websocket/session_outgoing.go @@ -3,9 +3,9 @@ package websocket import ( "time" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/messaging/internal/repository" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // Sends message to subscribers diff --git a/messaging/websocket/websocket.go b/messaging/websocket/websocket.go index 17f16f75a..650ab61dc 100644 --- a/messaging/websocket/websocket.go +++ b/messaging/websocket/websocket.go @@ -9,7 +9,7 @@ import ( "go.uber.org/zap" "github.com/cortezaproject/corteza-server/internal/auth" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" ) type ( diff --git a/monolith/monolith.go b/monolith/monolith.go index ceb584162..a8f6f5898 100644 --- a/monolith/monolith.go +++ b/monolith/monolith.go @@ -9,11 +9,11 @@ import ( "go.uber.org/zap" "github.com/cortezaproject/corteza-server/compose" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/messaging" "github.com/cortezaproject/corteza-server/pkg/api" "github.com/cortezaproject/corteza-server/pkg/cli" "github.com/cortezaproject/corteza-server/pkg/cli/flags" + "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/system" ) diff --git a/pkg/api/logger.go b/pkg/api/logger.go index 284050eb3..edfce8f5f 100644 --- a/pkg/api/logger.go +++ b/pkg/api/logger.go @@ -8,7 +8,7 @@ import ( "github.com/go-chi/chi/middleware" "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // contextLogger middleware binds logger to request's context. diff --git a/pkg/api/monitor.go b/pkg/api/monitor.go index 6c4f7ba23..e56429b1d 100644 --- a/pkg/api/monitor.go +++ b/pkg/api/monitor.go @@ -7,7 +7,7 @@ import ( "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" ) type Monitor struct { diff --git a/pkg/cli/helpers.go b/pkg/cli/helpers.go index c38cbaaac..ea01921b7 100644 --- a/pkg/cli/helpers.go +++ b/pkg/cli/helpers.go @@ -8,9 +8,9 @@ import ( "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/http" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/internal/mail" "github.com/cortezaproject/corteza-server/pkg/cli/flags" + "github.com/cortezaproject/corteza-server/pkg/logger" ) // SetupProvisionCommands sets-up standard provision commands diff --git a/internal/logger/context.go b/pkg/logger/context.go similarity index 100% rename from internal/logger/context.go rename to pkg/logger/context.go diff --git a/internal/logger/handlers.go b/pkg/logger/handlers.go similarity index 100% rename from internal/logger/handlers.go rename to pkg/logger/handlers.go diff --git a/internal/logger/logger.go b/pkg/logger/logger.go similarity index 100% rename from internal/logger/logger.go rename to pkg/logger/logger.go diff --git a/system/internal/auth/external/external.go b/system/internal/auth/external/external.go index 87567997a..115d3c571 100644 --- a/system/internal/auth/external/external.go +++ b/system/internal/auth/external/external.go @@ -3,8 +3,8 @@ package external import ( "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/internal/settings" + "github.com/cortezaproject/corteza-server/pkg/logger" ) func Init(settingsService settings.Service) { diff --git a/system/internal/auth/external/main_test.go b/system/internal/auth/external/main_test.go index 1a5bb247d..fdd043d2c 100644 --- a/system/internal/auth/external/main_test.go +++ b/system/internal/auth/external/main_test.go @@ -6,7 +6,7 @@ import ( "go.uber.org/zap/zapcore" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" ) func TestMain(m *testing.M) { diff --git a/system/internal/service/auth.go b/system/internal/service/auth.go index a59b63231..7d404e801 100644 --- a/system/internal/service/auth.go +++ b/system/internal/service/auth.go @@ -13,8 +13,8 @@ import ( "go.uber.org/zap/zapcore" "golang.org/x/crypto/bcrypt" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/internal/rand" + "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/system/internal/repository" "github.com/cortezaproject/corteza-server/system/types" ) diff --git a/system/internal/service/auth_notification.go b/system/internal/service/auth_notification.go index 59e52a2e4..17524864e 100644 --- a/system/internal/service/auth_notification.go +++ b/system/internal/service/auth_notification.go @@ -9,8 +9,8 @@ import ( "go.uber.org/zap/zapcore" gomail "gopkg.in/mail.v2" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/internal/mail" + "github.com/cortezaproject/corteza-server/pkg/logger" ) type ( diff --git a/system/internal/service/main_test.go b/system/internal/service/main_test.go index 98fb084df..32e7f1513 100644 --- a/system/internal/service/main_test.go +++ b/system/internal/service/main_test.go @@ -10,7 +10,7 @@ import ( "github.com/titpetric/factory" "go.uber.org/zap/zapcore" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" systemMigrate "github.com/cortezaproject/corteza-server/system/db" ) diff --git a/system/internal/service/service.go b/system/internal/service/service.go index d3432a193..cee086bd7 100644 --- a/system/internal/service/service.go +++ b/system/internal/service/service.go @@ -5,9 +5,9 @@ import ( "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/internal/permissions" internalSettings "github.com/cortezaproject/corteza-server/internal/settings" + "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/system/internal/repository" ) diff --git a/system/rest/auth_external.go b/system/rest/auth_external.go index ac5aeeea2..3c502b5db 100644 --- a/system/rest/auth_external.go +++ b/system/rest/auth_external.go @@ -16,7 +16,7 @@ import ( "go.uber.org/zap/zapcore" "github.com/cortezaproject/corteza-server/internal/auth" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/system/internal/service" ) diff --git a/system/rest/handlers/application.go b/system/rest/handlers/application.go index 967e33985..0b9f343a1 100644 --- a/system/rest/handlers/application.go +++ b/system/rest/handlers/application.go @@ -17,13 +17,12 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/system/rest/request" ) diff --git a/system/rest/handlers/auth.go b/system/rest/handlers/auth.go index 47441e849..e12ff1117 100644 --- a/system/rest/handlers/auth.go +++ b/system/rest/handlers/auth.go @@ -17,13 +17,12 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/system/rest/request" ) diff --git a/system/rest/handlers/auth_internal.go b/system/rest/handlers/auth_internal.go index 0f1486e8a..ffd49a773 100644 --- a/system/rest/handlers/auth_internal.go +++ b/system/rest/handlers/auth_internal.go @@ -17,13 +17,12 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/system/rest/request" ) diff --git a/system/rest/handlers/organisation.go b/system/rest/handlers/organisation.go index 58ad7ef78..df0952f5a 100644 --- a/system/rest/handlers/organisation.go +++ b/system/rest/handlers/organisation.go @@ -17,13 +17,12 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/system/rest/request" ) diff --git a/system/rest/handlers/permissions.go b/system/rest/handlers/permissions.go index be6d2f21a..1ad569269 100644 --- a/system/rest/handlers/permissions.go +++ b/system/rest/handlers/permissions.go @@ -17,13 +17,12 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/system/rest/request" ) diff --git a/system/rest/handlers/role.go b/system/rest/handlers/role.go index 44aac6a91..70f859710 100644 --- a/system/rest/handlers/role.go +++ b/system/rest/handlers/role.go @@ -17,13 +17,12 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/system/rest/request" ) diff --git a/system/rest/handlers/settings.go b/system/rest/handlers/settings.go index 41c81c7aa..d324f5c37 100644 --- a/system/rest/handlers/settings.go +++ b/system/rest/handlers/settings.go @@ -17,13 +17,12 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/system/rest/request" ) diff --git a/system/rest/handlers/user.go b/system/rest/handlers/user.go index b3d612726..664e8b6ed 100644 --- a/system/rest/handlers/user.go +++ b/system/rest/handlers/user.go @@ -17,13 +17,12 @@ package handlers import ( "context" - "net/http" "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/logger" + "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/system/rest/request" ) diff --git a/system/system.go b/system/system.go index eebd83817..6869ff816 100644 --- a/system/system.go +++ b/system/system.go @@ -11,10 +11,10 @@ import ( "go.uber.org/zap" "github.com/cortezaproject/corteza-server/internal/db" - "github.com/cortezaproject/corteza-server/internal/logger" "github.com/cortezaproject/corteza-server/pkg/api" "github.com/cortezaproject/corteza-server/pkg/cli" "github.com/cortezaproject/corteza-server/pkg/cli/flags" + "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/system/commands" migrate "github.com/cortezaproject/corteza-server/system/db" "github.com/cortezaproject/corteza-server/system/internal/service"