Replaced our own logger with logrus

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"
 )
 

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"

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"
 )

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"

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"

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"

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"
 )

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"

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"
 )

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) }

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"

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 {

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"

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"
 )
 

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"
 )

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())

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"
 )
 

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 {

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"
 )
 

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"
 )

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"
 )

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"
 )

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"
 

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
 )

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"
 )

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"
 )
 

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"

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"
 )

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"
 )

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"
 )
 

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"
 )

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:

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"
 )

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"
 )

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 {

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"
 )
 

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"
 )
 

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"

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"

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"
 )
 

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"
 )
 

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"

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"

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"

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)

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"
 )

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 {

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"
 )

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"
 

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"

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)
+}

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)

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"
 )

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) }