From 83f2d30d12081943ea3932698bd6528a1953cd25 Mon Sep 17 00:00:00 2001 From: Ev Kontsevoy Date: Tue, 2 Feb 2016 17:53:21 -0800 Subject: [PATCH] Replaced our own logger with logrus --- lib/auth/api_with_roles.go | 2 +- lib/auth/init.go | 2 +- lib/auth/new_web_user.go | 2 +- lib/auth/srv.go | 2 +- lib/auth/tun.go | 2 +- lib/backend/encryptedbk/encryptedbk.go | 2 +- .../encryptedbk/encryptor/naclencryptor.go | 2 +- lib/backend/encryptedbk/replicatedbk.go | 2 +- lib/client/client.go | 2 +- lib/client/client_test.go | 2 +- lib/client/keystore.go | 2 +- lib/events/boltlog/bl.go | 2 +- lib/limiter/connlimiter.go | 2 +- lib/recorder/boltrec/brec.go | 2 +- lib/reversetunnel/agent.go | 2 +- lib/reversetunnel/srv.go | 4 +-- lib/service/cfg_test.go | 2 +- lib/service/service.go | 30 ++++++++++++++++--- lib/service/supervisor.go | 2 +- lib/services/ca.go | 2 +- lib/services/services_test.go | 2 +- lib/services/user.go | 2 +- lib/services/web.go | 2 +- lib/srv/ctx.go | 2 +- lib/srv/exec.go | 2 +- lib/srv/fwd.go | 2 +- lib/srv/ls.go | 2 +- lib/srv/mux.go | 2 +- lib/srv/proxy.go | 2 +- lib/srv/sess.go | 2 +- lib/srv/sites.go | 2 +- lib/srv/srv.go | 2 +- lib/srv/term.go | 2 +- lib/srv/tun.go | 2 +- lib/sshutils/close.go | 2 +- lib/sshutils/scp/scp.go | 2 +- lib/sshutils/scp/scp_test.go | 2 +- lib/sshutils/server.go | 2 +- lib/sshutils/server_test.go | 2 +- lib/sshutils/tcpip.go | 2 +- lib/sshutils/up.go | 2 +- lib/teleagent/agent.go | 2 +- lib/web/auth.go | 2 +- lib/web/multi.go | 2 +- lib/web/proxy.go | 4 +-- lib/web/site.go | 2 +- lib/web/tunauth.go | 2 +- lib/web/ws.go | 2 +- tool/tctl/command/cmd_test.go | 2 +- tool/tctl/command/teleagent_test.go | 2 +- tool/tctl/main.go | 19 ++++++++++-- tool/teleport/main.go | 8 +++-- tool/tsh/tsh/tsh.go | 2 +- tool/tsh/tsh/tsh_test.go | 2 +- 54 files changed, 102 insertions(+), 61 deletions(-) diff --git a/lib/auth/api_with_roles.go b/lib/auth/api_with_roles.go index ed10c8aa11b..6d9d485df41 100644 --- a/lib/auth/api_with_roles.go +++ b/lib/auth/api_with_roles.go @@ -27,7 +27,7 @@ import ( "github.com/gravitational/teleport/lib/session" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" ) diff --git a/lib/auth/init.go b/lib/auth/init.go index cc9b6e53c49..9e5f2acf6cc 100644 --- a/lib/auth/init.go +++ b/lib/auth/init.go @@ -28,7 +28,7 @@ import ( "github.com/gravitational/teleport/lib/sshutils" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/session" "github.com/gravitational/trace" "github.com/mailgun/lemma/secret" diff --git a/lib/auth/new_web_user.go b/lib/auth/new_web_user.go index e47569b2884..d383f469a62 100644 --- a/lib/auth/new_web_user.go +++ b/lib/auth/new_web_user.go @@ -28,7 +28,7 @@ import ( "github.com/gravitational/teleport/lib/services" "github.com/gokyle/hotp" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/session" "github.com/gravitational/trace" ) diff --git a/lib/auth/srv.go b/lib/auth/srv.go index 61ed28c9499..ed783c6e31d 100644 --- a/lib/auth/srv.go +++ b/lib/auth/srv.go @@ -33,7 +33,7 @@ import ( "github.com/codahale/lunk" "github.com/gravitational/form" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/roundtrip" websession "github.com/gravitational/session" "github.com/gravitational/trace" diff --git a/lib/auth/tun.go b/lib/auth/tun.go index c350b71899b..592b4e85f7f 100644 --- a/lib/auth/tun.go +++ b/lib/auth/tun.go @@ -26,7 +26,7 @@ import ( "github.com/gravitational/teleport/lib/sshutils" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/roundtrip" "github.com/gravitational/session" "github.com/gravitational/trace" diff --git a/lib/backend/encryptedbk/encryptedbk.go b/lib/backend/encryptedbk/encryptedbk.go index 33a3f7d54a0..4cc772a43f1 100644 --- a/lib/backend/encryptedbk/encryptedbk.go +++ b/lib/backend/encryptedbk/encryptedbk.go @@ -19,7 +19,7 @@ package encryptedbk import ( "time" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "github.com/gravitational/teleport" diff --git a/lib/backend/encryptedbk/encryptor/naclencryptor.go b/lib/backend/encryptedbk/encryptor/naclencryptor.go index be88177d80b..5eb8e94d36c 100644 --- a/lib/backend/encryptedbk/encryptor/naclencryptor.go +++ b/lib/backend/encryptedbk/encryptor/naclencryptor.go @@ -20,7 +20,7 @@ import ( "encoding/hex" "encoding/json" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "github.com/mailgun/lemma/secret" ) diff --git a/lib/backend/encryptedbk/replicatedbk.go b/lib/backend/encryptedbk/replicatedbk.go index 28a5acc8e71..b9536cc2980 100644 --- a/lib/backend/encryptedbk/replicatedbk.go +++ b/lib/backend/encryptedbk/replicatedbk.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "github.com/gravitational/teleport" diff --git a/lib/client/client.go b/lib/client/client.go index 827c692cb4c..aa6d6de2d18 100644 --- a/lib/client/client.go +++ b/lib/client/client.go @@ -39,7 +39,7 @@ import ( "github.com/gravitational/teleport/lib/sshutils/scp" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" ) diff --git a/lib/client/client_test.go b/lib/client/client_test.go index e351dbc6a6f..e54351077aa 100644 --- a/lib/client/client_test.go +++ b/lib/client/client_test.go @@ -46,7 +46,7 @@ import ( "golang.org/x/crypto/ssh/agent" . "gopkg.in/check.v1" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" ) func TestClient(t *testing.T) { TestingT(t) } diff --git a/lib/client/keystore.go b/lib/client/keystore.go index def4f1906b1..6c29b55f4a8 100644 --- a/lib/client/keystore.go +++ b/lib/client/keystore.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" diff --git a/lib/events/boltlog/bl.go b/lib/events/boltlog/bl.go index 5d7d8f06f38..b512c8d7229 100644 --- a/lib/events/boltlog/bl.go +++ b/lib/events/boltlog/bl.go @@ -27,7 +27,7 @@ import ( "github.com/boltdb/bolt" "github.com/codahale/lunk" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" ) type BoltLog struct { diff --git a/lib/limiter/connlimiter.go b/lib/limiter/connlimiter.go index 3281fd490a8..65b5f9c1cf3 100644 --- a/lib/limiter/connlimiter.go +++ b/lib/limiter/connlimiter.go @@ -19,7 +19,7 @@ import ( "net/http" "sync" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "github.com/vulcand/oxy/connlimit" "github.com/vulcand/oxy/utils" diff --git a/lib/recorder/boltrec/brec.go b/lib/recorder/boltrec/brec.go index adea2a87b02..3b2280d9247 100644 --- a/lib/recorder/boltrec/brec.go +++ b/lib/recorder/boltrec/brec.go @@ -28,7 +28,7 @@ import ( "github.com/gravitational/teleport/lib/recorder" "github.com/boltdb/bolt" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" ) diff --git a/lib/reversetunnel/agent.go b/lib/reversetunnel/agent.go index 9d0def55d6e..43a3884acb2 100644 --- a/lib/reversetunnel/agent.go +++ b/lib/reversetunnel/agent.go @@ -28,7 +28,7 @@ import ( "github.com/gravitational/teleport/lib/utils" "github.com/codahale/lunk" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" ) diff --git a/lib/reversetunnel/srv.go b/lib/reversetunnel/srv.go index f9d9ab13e2b..aa7fe315b20 100644 --- a/lib/reversetunnel/srv.go +++ b/lib/reversetunnel/srv.go @@ -30,8 +30,8 @@ import ( "github.com/gravitational/teleport/lib/sshutils" "github.com/gravitational/teleport/lib/utils" + log "github.com/Sirupsen/logrus" "github.com/codahale/lunk" - "github.com/gravitational/log" "github.com/gravitational/roundtrip" "github.com/gravitational/trace" "github.com/mailgun/oxy/forward" @@ -438,7 +438,7 @@ func (s *remoteSite) handleAuthProxy(w http.ResponseWriter, r *http.Request) { }, } - fwd, err := forward.New(forward.RoundTripper(tr), forward.Logger(log.GetLogger())) + fwd, err := forward.New(forward.RoundTripper(tr), forward.Logger(log.StandardLogger())) if err != nil { log.Errorf("write: %v", err) roundtrip.ReplyJSON(w, http.StatusInternalServerError, err.Error()) diff --git a/lib/service/cfg_test.go b/lib/service/cfg_test.go index b31cc3819e7..4f9f8f3c537 100644 --- a/lib/service/cfg_test.go +++ b/lib/service/cfg_test.go @@ -25,7 +25,7 @@ import ( "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/configure" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" . "gopkg.in/check.v1" ) diff --git a/lib/service/service.go b/lib/service/service.go index f7d8da397cb..b025641b8f5 100644 --- a/lib/service/service.go +++ b/lib/service/service.go @@ -16,11 +16,15 @@ limitations under the License. package service import ( + "io/ioutil" + "log/syslog" "net/http" "os" "path" + "strings" "time" + logrus_syslog "github.com/Sirupsen/logrus/hooks/syslog" "github.com/gravitational/teleport/lib/auth" authority "github.com/gravitational/teleport/lib/auth/native" "github.com/gravitational/teleport/lib/backend" @@ -40,8 +44,8 @@ import ( "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/teleport/lib/web" + log "github.com/Sirupsen/logrus" "github.com/codahale/lunk" - "github.com/gravitational/log" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" ) @@ -222,7 +226,7 @@ func initSSHEndpoint(supervisor Supervisor, cfg Config) error { elog := &FanOutEventLogger{ Loggers: []lunk.EventLogger{ - lunk.NewTextEventLogger(log.GetLogger().Writer(log.SeverityInfo)), + lunk.NewTextEventLogger(log.StandardLogger().Writer()), client, }, } @@ -332,7 +336,7 @@ func initTunAgent(supervisor Supervisor, cfg Config) error { elog := &FanOutEventLogger{ Loggers: []lunk.EventLogger{ - lunk.NewTextEventLogger(log.GetLogger().Writer(log.SeverityInfo)), + lunk.NewTextEventLogger(log.StandardLogger().Writer()), client, }} @@ -544,7 +548,25 @@ func initRecordBackend(btype string, params string) (recorder.Recorder, error) { } func initLogging(ltype, severity string) error { - return log.Initialize(ltype, severity) + useSyslog := true + infoLevel := log.ErrorLevel + + switch strings.ToLower(ltype) { + case "console", "stderr": + useSyslog = false + } + + if useSyslog { + hook, err := logrus_syslog.NewSyslogHook("", "", syslog.LOG_ERR, "") + if err != nil { + return trace.Wrap(err) + } + log.AddHook(hook) + log.SetOutput(ioutil.Discard) + } else { + } + log.SetLevel(infoLevel) + return nil } func validateConfig(cfg Config) error { diff --git a/lib/service/supervisor.go b/lib/service/supervisor.go index 3be0bfbadec..7eef93a7928 100644 --- a/lib/service/supervisor.go +++ b/lib/service/supervisor.go @@ -18,7 +18,7 @@ package service import ( "sync" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" ) diff --git a/lib/services/ca.go b/lib/services/ca.go index de12a5930c6..27e7273127c 100644 --- a/lib/services/ca.go +++ b/lib/services/ca.go @@ -19,7 +19,7 @@ import ( "encoding/json" "time" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/trace" ) diff --git a/lib/services/services_test.go b/lib/services/services_test.go index e331079dae5..414a245fb4d 100644 --- a/lib/services/services_test.go +++ b/lib/services/services_test.go @@ -19,7 +19,7 @@ import ( "path/filepath" "testing" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/teleport/lib/backend/boltbk" . "gopkg.in/check.v1" ) diff --git a/lib/services/user.go b/lib/services/user.go index eeec8271a08..0f876e671c7 100644 --- a/lib/services/user.go +++ b/lib/services/user.go @@ -18,7 +18,7 @@ package services import ( "time" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/trace" ) diff --git a/lib/services/web.go b/lib/services/web.go index 4cba543c0f0..c2346e25f08 100644 --- a/lib/services/web.go +++ b/lib/services/web.go @@ -24,7 +24,7 @@ import ( "github.com/gokyle/hotp" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "golang.org/x/crypto/bcrypt" diff --git a/lib/srv/ctx.go b/lib/srv/ctx.go index 03944bf66a3..0208ce4233b 100644 --- a/lib/srv/ctx.go +++ b/lib/srv/ctx.go @@ -22,7 +22,7 @@ import ( "sync/atomic" "github.com/codahale/lunk" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" // ctxID is a incremental context ID used for debugging and logging purposes ) diff --git a/lib/srv/exec.go b/lib/srv/exec.go index 0d3c506b3bd..ea8b0e3f803 100644 --- a/lib/srv/exec.go +++ b/lib/srv/exec.go @@ -22,7 +22,7 @@ import ( "os/exec" "syscall" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/teleport/lib/events" "golang.org/x/crypto/ssh" ) diff --git a/lib/srv/fwd.go b/lib/srv/fwd.go index 8d2fd64345d..7c005006832 100644 --- a/lib/srv/fwd.go +++ b/lib/srv/fwd.go @@ -16,7 +16,7 @@ limitations under the License. package srv import ( - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "golang.org/x/crypto/ssh" ) diff --git a/lib/srv/ls.go b/lib/srv/ls.go index 4b7a79011de..8c0e25aee30 100644 --- a/lib/srv/ls.go +++ b/lib/srv/ls.go @@ -21,7 +21,7 @@ import ( "io/ioutil" "regexp" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" diff --git a/lib/srv/mux.go b/lib/srv/mux.go index 6f25b383c51..4d64136e76f 100644 --- a/lib/srv/mux.go +++ b/lib/srv/mux.go @@ -20,7 +20,7 @@ import ( "io" "regexp" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/teleport/lib/sshutils" "golang.org/x/crypto/ssh" ) diff --git a/lib/srv/proxy.go b/lib/srv/proxy.go index 2a61df66665..6111e9fa850 100644 --- a/lib/srv/proxy.go +++ b/lib/srv/proxy.go @@ -9,7 +9,7 @@ import ( "github.com/gravitational/teleport/lib/services" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" ) diff --git a/lib/srv/sess.go b/lib/srv/sess.go index 1126fa8bb01..7fe3c36e15d 100644 --- a/lib/srv/sess.go +++ b/lib/srv/sess.go @@ -30,7 +30,7 @@ import ( "code.google.com/p/go-uuid/uuid" "github.com/codahale/lunk" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "golang.org/x/crypto/ssh" ) diff --git a/lib/srv/sites.go b/lib/srv/sites.go index 62d8273d644..33451d63505 100644 --- a/lib/srv/sites.go +++ b/lib/srv/sites.go @@ -3,7 +3,7 @@ package srv import ( "encoding/json" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" ) diff --git a/lib/srv/srv.go b/lib/srv/srv.go index 30c7df09b5c..8639a4a0b8e 100644 --- a/lib/srv/srv.go +++ b/lib/srv/srv.go @@ -40,7 +40,7 @@ import ( "code.google.com/p/go-uuid/uuid" "github.com/codahale/lunk" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" // Server implements SSH server that uses configuration backend and certificate-based authentication: diff --git a/lib/srv/term.go b/lib/srv/term.go index 4c59f8cb1e0..ae0989de83b 100644 --- a/lib/srv/term.go +++ b/lib/srv/term.go @@ -23,7 +23,7 @@ import ( "github.com/gravitational/teleport/lib/sshutils" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/kr/pty" "golang.org/x/crypto/ssh" ) diff --git a/lib/srv/tun.go b/lib/srv/tun.go index fab00611375..00a4eea5a63 100644 --- a/lib/srv/tun.go +++ b/lib/srv/tun.go @@ -20,7 +20,7 @@ import ( "strings" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/teleport/lib/sshutils" "golang.org/x/crypto/ssh" ) diff --git a/lib/sshutils/close.go b/lib/sshutils/close.go index 69b291aa6f3..26f3ca5eee8 100644 --- a/lib/sshutils/close.go +++ b/lib/sshutils/close.go @@ -18,7 +18,7 @@ package sshutils import ( "io" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" ) func CloseAll(closers ...io.Closer) error { diff --git a/lib/sshutils/scp/scp.go b/lib/sshutils/scp/scp.go index b04e7a96263..952630501b3 100644 --- a/lib/sshutils/scp/scp.go +++ b/lib/sshutils/scp/scp.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" ) diff --git a/lib/sshutils/scp/scp_test.go b/lib/sshutils/scp/scp_test.go index 76d3b56726e..e4b8b0e3be9 100644 --- a/lib/sshutils/scp/scp_test.go +++ b/lib/sshutils/scp/scp_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" . "gopkg.in/check.v1" ) diff --git a/lib/sshutils/server.go b/lib/sshutils/server.go index c7f4dac0d6c..d547241d13e 100644 --- a/lib/sshutils/server.go +++ b/lib/sshutils/server.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/teleport/lib/limiter" "github.com/gravitational/teleport/lib/utils" "golang.org/x/crypto/ssh" diff --git a/lib/sshutils/server_test.go b/lib/sshutils/server_test.go index 220e5aa11c6..b97ec8ade55 100644 --- a/lib/sshutils/server_test.go +++ b/lib/sshutils/server_test.go @@ -23,7 +23,7 @@ import ( "github.com/gravitational/teleport/lib/limiter" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/testdata" . "gopkg.in/check.v1" diff --git a/lib/sshutils/tcpip.go b/lib/sshutils/tcpip.go index 867c9d83e13..9fb6057825b 100644 --- a/lib/sshutils/tcpip.go +++ b/lib/sshutils/tcpip.go @@ -16,7 +16,7 @@ limitations under the License. package sshutils import ( - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "golang.org/x/crypto/ssh" ) diff --git a/lib/sshutils/up.go b/lib/sshutils/up.go index d2e0a6a6b69..b58d7260ff3 100644 --- a/lib/sshutils/up.go +++ b/lib/sshutils/up.go @@ -19,7 +19,7 @@ import ( "fmt" "io" - // "github.com/gravitational/log" + // log "github.com/Sirupsen/logrus" "golang.org/x/crypto/ssh" ) diff --git a/lib/teleagent/agent.go b/lib/teleagent/agent.go index f9ffc44dcbc..a5e177d4026 100644 --- a/lib/teleagent/agent.go +++ b/lib/teleagent/agent.go @@ -9,7 +9,7 @@ import ( "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/teleport/lib/web" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" diff --git a/lib/web/auth.go b/lib/web/auth.go index 462f7e9a0ba..7861358ce5e 100644 --- a/lib/web/auth.go +++ b/lib/web/auth.go @@ -26,7 +26,7 @@ import ( "github.com/gravitational/teleport/lib/sshutils" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "github.com/julienschmidt/httprouter" "github.com/mailgun/ttlmap" diff --git a/lib/web/multi.go b/lib/web/multi.go index 5499f02b219..e0de9ad7451 100644 --- a/lib/web/multi.go +++ b/lib/web/multi.go @@ -28,7 +28,7 @@ import ( "time" "github.com/gravitational/form" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/roundtrip" "github.com/gravitational/session" "github.com/gravitational/teleport/lib/reversetunnel" diff --git a/lib/web/proxy.go b/lib/web/proxy.go index 07c09b23735..09209238164 100644 --- a/lib/web/proxy.go +++ b/lib/web/proxy.go @@ -26,7 +26,7 @@ import ( "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/mailgun/oxy/forward" "github.com/mailgun/route" "golang.org/x/crypto/ssh" @@ -69,7 +69,7 @@ func (p *proxyHandler) serveProxyRequest(prefix string, w http.ResponseWriter, r forward.RoundTripper(&http.Transport{ Dial: (&tunDialer{addr: tun.ProxyAddr, user: user, agent: agent}).Dial, }), - forward.Logger(log.GetLogger()), + forward.Logger(log.StandardLogger()), ) if err != nil { return fmt.Errorf("failed to create forwarder: %v", err) diff --git a/lib/web/site.go b/lib/web/site.go index 508986dc156..57967367b02 100644 --- a/lib/web/site.go +++ b/lib/web/site.go @@ -38,7 +38,7 @@ import ( "github.com/codahale/lunk" "github.com/gravitational/form" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/roundtrip" "github.com/julienschmidt/httprouter" ) diff --git a/lib/web/tunauth.go b/lib/web/tunauth.go index 9eefa9fec45..6267f635c42 100644 --- a/lib/web/tunauth.go +++ b/lib/web/tunauth.go @@ -20,7 +20,7 @@ import ( "github.com/gravitational/teleport/lib/reversetunnel" "github.com/gravitational/teleport/lib/sshutils" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" ) type TunAuth struct { diff --git a/lib/web/ws.go b/lib/web/ws.go index d67bcb2269c..a5c039ff0e6 100644 --- a/lib/web/ws.go +++ b/lib/web/ws.go @@ -20,7 +20,7 @@ import ( "github.com/gravitational/teleport/lib/sshutils" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "golang.org/x/crypto/ssh" "golang.org/x/net/websocket" ) diff --git a/tool/tctl/command/cmd_test.go b/tool/tctl/command/cmd_test.go index 04d2bc97f4e..1b68e33c129 100644 --- a/tool/tctl/command/cmd_test.go +++ b/tool/tctl/command/cmd_test.go @@ -38,7 +38,7 @@ import ( "github.com/gravitational/teleport/lib/session" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/mailgun/lemma/secret" "golang.org/x/crypto/ssh" diff --git a/tool/tctl/command/teleagent_test.go b/tool/tctl/command/teleagent_test.go index a6c6e124d8d..75c03a1c052 100644 --- a/tool/tctl/command/teleagent_test.go +++ b/tool/tctl/command/teleagent_test.go @@ -39,7 +39,7 @@ import ( "github.com/gravitational/teleport/lib/web" "github.com/gokyle/hotp" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "github.com/mailgun/lemma/secret" "golang.org/x/crypto/ssh" diff --git a/tool/tctl/main.go b/tool/tctl/main.go index 38a7cf61345..d4cc031dd5c 100644 --- a/tool/tctl/main.go +++ b/tool/tctl/main.go @@ -16,14 +16,17 @@ limitations under the License. package main import ( + "io/ioutil" + "log/syslog" "os" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" + logrus_syslog "github.com/Sirupsen/logrus/hooks/syslog" "github.com/gravitational/teleport/tool/tctl/command" // TODO(klizhentas) fix the interface for logging ) func main() { - log.Initialize("console", "INFO") + initLogger() cmd := command.NewCommand() err := cmd.Run(os.Args) @@ -31,3 +34,15 @@ func main() { log.Errorf("%v", err) } } + +func initLogger() { + // configure logrus to use syslog: + hook, err := logrus_syslog.NewSyslogHook("", "", syslog.LOG_ERR, "") + if err != nil { + panic(err) + } + log.AddHook(hook) + // ... and disable its own output: + log.SetOutput(ioutil.Discard) + log.SetLevel(log.InfoLevel) +} diff --git a/tool/teleport/main.go b/tool/teleport/main.go index 0ad99ee4a94..3e0a431efb7 100644 --- a/tool/teleport/main.go +++ b/tool/teleport/main.go @@ -20,13 +20,17 @@ import ( "github.com/gravitational/teleport/lib/service" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "gopkg.in/alecthomas/kingpin.v2" ) func main() { - log.Initialize("console", "INFO") + // default logging is "errors to stderr" until we parse the config file + // and re-initialize logger + log.SetOutput(os.Stderr) + log.SetLevel(log.ErrorLevel) + if err := run(); err != nil { log.Errorf("teleport error: %v", err) os.Exit(1) diff --git a/tool/tsh/tsh/tsh.go b/tool/tsh/tsh/tsh.go index 59dfd49255a..0c6a1a4572c 100644 --- a/tool/tsh/tsh/tsh.go +++ b/tool/tsh/tsh/tsh.go @@ -28,7 +28,7 @@ import ( "github.com/gravitational/teleport/lib/client" "github.com/gravitational/teleport/lib/services" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" ) diff --git a/tool/tsh/tsh/tsh_test.go b/tool/tsh/tsh/tsh_test.go index a395d8e4c99..e03f095074e 100644 --- a/tool/tsh/tsh/tsh_test.go +++ b/tool/tsh/tsh/tsh_test.go @@ -48,7 +48,7 @@ import ( "golang.org/x/crypto/ssh" . "gopkg.in/check.v1" - "github.com/gravitational/log" + log "github.com/Sirupsen/logrus" ) func TestTsh(t *testing.T) { TestingT(t) }