diff --git a/go/acl/acl.go b/go/acl/acl.go index 99fb1fb32e7..1ea5d245dc7 100644 --- a/go/acl/acl.go +++ b/go/acl/acl.go @@ -26,7 +26,7 @@ import ( "net/http" "sync" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) // This is a list of predefined roles. Applications are free diff --git a/go/cmd/mysqlctl/mysqlctl.go b/go/cmd/mysqlctl/mysqlctl.go index 040971e6c58..43b7bd048ba 100644 --- a/go/cmd/mysqlctl/mysqlctl.go +++ b/go/cmd/mysqlctl/mysqlctl.go @@ -23,7 +23,6 @@ import ( "os" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/exit" @@ -31,6 +30,7 @@ import ( "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/netutil" "vitess.io/vitess/go/vt/dbconfigs" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/mysqlctl" ) diff --git a/go/cmd/mysqlctld/mysqlctld.go b/go/cmd/mysqlctld/mysqlctld.go index 654e2e1dd56..f1aca79fe23 100644 --- a/go/cmd/mysqlctld/mysqlctld.go +++ b/go/cmd/mysqlctld/mysqlctld.go @@ -24,10 +24,10 @@ import ( "os" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/exit" "vitess.io/vitess/go/vt/dbconfigs" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/mysqlctl" "vitess.io/vitess/go/vt/servenv" diff --git a/go/cmd/query_analyzer/query_analyzer.go b/go/cmd/query_analyzer/query_analyzer.go index c3bbe4bda69..ecb67da891d 100644 --- a/go/cmd/query_analyzer/query_analyzer.go +++ b/go/cmd/query_analyzer/query_analyzer.go @@ -25,8 +25,8 @@ import ( "os" "sort" - log "github.com/golang/glog" "vitess.io/vitess/go/exit" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" ) diff --git a/go/cmd/topo2topo/topo2topo.go b/go/cmd/topo2topo/topo2topo.go index 69a05975582..7295877587b 100644 --- a/go/cmd/topo2topo/topo2topo.go +++ b/go/cmd/topo2topo/topo2topo.go @@ -19,9 +19,9 @@ package main import ( "flag" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/exit" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/topo/helpers" diff --git a/go/cmd/vtclient/vtclient.go b/go/cmd/vtclient/vtclient.go index 8f3b93c07a2..e866fef7566 100644 --- a/go/cmd/vtclient/vtclient.go +++ b/go/cmd/vtclient/vtclient.go @@ -29,9 +29,9 @@ import ( "sync" "time" - log "github.com/golang/glog" "github.com/olekukonko/tablewriter" "vitess.io/vitess/go/vt/concurrency" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vitessdriver" diff --git a/go/cmd/vtcombo/main.go b/go/cmd/vtcombo/main.go index a6e97ff1372..b3e30c44960 100644 --- a/go/cmd/vtcombo/main.go +++ b/go/cmd/vtcombo/main.go @@ -26,13 +26,13 @@ import ( "strings" "time" - log "github.com/golang/glog" "github.com/golang/protobuf/proto" "golang.org/x/net/context" "vitess.io/vitess/go/exit" "vitess.io/vitess/go/vt/dbconfigs" "vitess.io/vitess/go/vt/discovery" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/mysqlctl" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/srvtopo" diff --git a/go/cmd/vtcombo/tablet_map.go b/go/cmd/vtcombo/tablet_map.go index 89035f0da66..3f2250c15fc 100644 --- a/go/cmd/vtcombo/tablet_map.go +++ b/go/cmd/vtcombo/tablet_map.go @@ -24,7 +24,6 @@ import ( "strings" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/sqltypes" @@ -32,6 +31,7 @@ import ( "vitess.io/vitess/go/vt/grpcclient" "vitess.io/vitess/go/vt/hook" "vitess.io/vitess/go/vt/key" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/mysqlctl" "vitess.io/vitess/go/vt/mysqlctl/tmutils" diff --git a/go/cmd/vtctl/vtctl.go b/go/cmd/vtctl/vtctl.go index 0c4ed75572a..3ca10a9e163 100644 --- a/go/cmd/vtctl/vtctl.go +++ b/go/cmd/vtctl/vtctl.go @@ -26,9 +26,9 @@ import ( "syscall" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/exit" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/topo" diff --git a/go/cmd/vtctlclient/main.go b/go/cmd/vtctlclient/main.go index b660f25d764..f807d2882d2 100644 --- a/go/cmd/vtctlclient/main.go +++ b/go/cmd/vtctlclient/main.go @@ -22,9 +22,9 @@ import ( "os" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/exit" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/vtctl/vtctlclient" diff --git a/go/cmd/vtctld/schema.go b/go/cmd/vtctld/schema.go index 7397eaaeebe..1248938d6a7 100644 --- a/go/cmd/vtctld/schema.go +++ b/go/cmd/vtctld/schema.go @@ -22,8 +22,8 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" "vitess.io/vitess/go/timer" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/schemamanager" "vitess.io/vitess/go/vt/servenv" diff --git a/go/cmd/vtexplain/vtexplain.go b/go/cmd/vtexplain/vtexplain.go index 1ea7db8f2a2..db00e3d06d6 100644 --- a/go/cmd/vtexplain/vtexplain.go +++ b/go/cmd/vtexplain/vtexplain.go @@ -21,8 +21,8 @@ import ( "fmt" "io/ioutil" - log "github.com/golang/glog" "vitess.io/vitess/go/exit" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/vtexplain" diff --git a/go/cmd/vtgate/vtgate.go b/go/cmd/vtgate/vtgate.go index fad6bb70d33..989875499dc 100644 --- a/go/cmd/vtgate/vtgate.go +++ b/go/cmd/vtgate/vtgate.go @@ -24,10 +24,9 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" - "vitess.io/vitess/go/exit" "vitess.io/vitess/go/vt/discovery" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/srvtopo" "vitess.io/vitess/go/vt/topo" diff --git a/go/cmd/vtgateclienttest/services/terminal.go b/go/cmd/vtgateclienttest/services/terminal.go index c6da6d6a001..b3ba8082a0d 100644 --- a/go/cmd/vtgateclienttest/services/terminal.go +++ b/go/cmd/vtgateclienttest/services/terminal.go @@ -20,11 +20,10 @@ import ( "errors" "fmt" - log "github.com/golang/glog" - "golang.org/x/net/context" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/tb" + "vitess.io/vitess/go/vt/log" querypb "vitess.io/vitess/go/vt/proto/query" topodatapb "vitess.io/vitess/go/vt/proto/topodata" diff --git a/go/cmd/vtqueryserver/vtqueryserver.go b/go/cmd/vtqueryserver/vtqueryserver.go index 87339f62b1d..6a189096016 100644 --- a/go/cmd/vtqueryserver/vtqueryserver.go +++ b/go/cmd/vtqueryserver/vtqueryserver.go @@ -20,8 +20,8 @@ import ( "flag" "os" - log "github.com/golang/glog" "vitess.io/vitess/go/vt/dbconfigs" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/vtqueryserver" "vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv" diff --git a/go/cmd/vttablet/vttablet.go b/go/cmd/vttablet/vttablet.go index 98cb0927667..a3130b70002 100644 --- a/go/cmd/vttablet/vttablet.go +++ b/go/cmd/vttablet/vttablet.go @@ -20,9 +20,9 @@ package main import ( "flag" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/vt/dbconfigs" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/mysqlctl" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/tableacl" diff --git a/go/cmd/vttestserver/main.go b/go/cmd/vttestserver/main.go index 22a4a4e716c..497c1791139 100644 --- a/go/cmd/vttestserver/main.go +++ b/go/cmd/vttestserver/main.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - log "github.com/golang/glog" "github.com/golang/protobuf/proto" + "vitess.io/vitess/go/vt/log" vttestpb "vitess.io/vitess/go/vt/proto/vttest" "vitess.io/vitess/go/vt/vttest" ) diff --git a/go/cmd/vttlstest/vttlstest.go b/go/cmd/vttlstest/vttlstest.go index 9e2aee74604..889960bd101 100644 --- a/go/cmd/vttlstest/vttlstest.go +++ b/go/cmd/vttlstest/vttlstest.go @@ -21,9 +21,8 @@ import ( "fmt" "os" - log "github.com/golang/glog" - "vitess.io/vitess/go/exit" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/tlstest" ) diff --git a/go/cmd/vtworker/vtworker.go b/go/cmd/vtworker/vtworker.go index e0ed8f84bd1..e2cef98b1f7 100644 --- a/go/cmd/vtworker/vtworker.go +++ b/go/cmd/vtworker/vtworker.go @@ -29,9 +29,9 @@ import ( "os" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/exit" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/topo" diff --git a/go/cmd/vtworkerclient/vtworkerclient.go b/go/cmd/vtworkerclient/vtworkerclient.go index c7f102e6a59..0e1874453ba 100644 --- a/go/cmd/vtworkerclient/vtworkerclient.go +++ b/go/cmd/vtworkerclient/vtworkerclient.go @@ -22,8 +22,8 @@ import ( "os/signal" "syscall" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/worker/vtworkerclient" diff --git a/go/cmd/zk/zkcmd.go b/go/cmd/zk/zkcmd.go index 2f809d7ea14..acf612d8750 100644 --- a/go/cmd/zk/zkcmd.go +++ b/go/cmd/zk/zkcmd.go @@ -32,12 +32,12 @@ import ( "syscall" "time" - log "github.com/golang/glog" "github.com/samuel/go-zookeeper/zk" "golang.org/x/crypto/ssh/terminal" "golang.org/x/net/context" "vitess.io/vitess/go/exit" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/topo/zk2topo" "vitess.io/vitess/go/vt/vtctl" diff --git a/go/cmd/zkctl/zkctl.go b/go/cmd/zkctl/zkctl.go index d265910a923..23d48f804fe 100644 --- a/go/cmd/zkctl/zkctl.go +++ b/go/cmd/zkctl/zkctl.go @@ -23,8 +23,8 @@ import ( "fmt" "os" - log "github.com/golang/glog" "vitess.io/vitess/go/exit" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/zkctl" ) diff --git a/go/cmd/zkctld/zkctld.go b/go/cmd/zkctld/zkctld.go index 0a101d4fe3c..d2847d168d4 100644 --- a/go/cmd/zkctld/zkctld.go +++ b/go/cmd/zkctld/zkctld.go @@ -25,8 +25,8 @@ import ( "os/signal" "syscall" - log "github.com/golang/glog" "vitess.io/vitess/go/exit" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/zkctl" ) diff --git a/go/event/syslogger/syslogger.go b/go/event/syslogger/syslogger.go index 7c66fdf25f7..356b5dd18d5 100644 --- a/go/event/syslogger/syslogger.go +++ b/go/event/syslogger/syslogger.go @@ -53,8 +53,8 @@ import ( "log/syslog" "os" - log "github.com/golang/glog" "vitess.io/vitess/go/event" + "vitess.io/vitess/go/vt/log" ) // Syslogger is the interface that events should implement if they want to be diff --git a/go/exit/exit.go b/go/exit/exit.go index 7207a047d00..195f6580af1 100644 --- a/go/exit/exit.go +++ b/go/exit/exit.go @@ -50,8 +50,8 @@ package exit import ( "os" - log "github.com/golang/glog" "vitess.io/vitess/go/tb" + "vitess.io/vitess/go/vt/log" ) type exitCode int diff --git a/go/mysql/auth_server.go b/go/mysql/auth_server.go index d78c5688b98..5ea03afc069 100644 --- a/go/mysql/auth_server.go +++ b/go/mysql/auth_server.go @@ -22,7 +22,7 @@ import ( "fmt" "net" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) // AuthServer is the interface that servers must implement to validate diff --git a/go/mysql/auth_server_static.go b/go/mysql/auth_server_static.go index 77931446bbf..efa646aeecb 100644 --- a/go/mysql/auth_server_static.go +++ b/go/mysql/auth_server_static.go @@ -27,8 +27,7 @@ import ( "os/signal" "syscall" - log "github.com/golang/glog" - + "vitess.io/vitess/go/vt/log" querypb "vitess.io/vitess/go/vt/proto/query" ) diff --git a/go/mysql/ldapauthserver/auth_server_ldap.go b/go/mysql/ldapauthserver/auth_server_ldap.go index 8cbb4dc457e..1aeac844e59 100644 --- a/go/mysql/ldapauthserver/auth_server_ldap.go +++ b/go/mysql/ldapauthserver/auth_server_ldap.go @@ -25,10 +25,10 @@ import ( "sync" "time" - log "github.com/golang/glog" "gopkg.in/ldap.v2" "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/netutil" + "vitess.io/vitess/go/vt/log" querypb "vitess.io/vitess/go/vt/proto/query" "vitess.io/vitess/go/vt/vttls" ) diff --git a/go/mysql/server.go b/go/mysql/server.go index d5f6700abb8..18feea0c1a0 100644 --- a/go/mysql/server.go +++ b/go/mysql/server.go @@ -24,10 +24,10 @@ import ( "net" "time" - log "github.com/golang/glog" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/stats" "vitess.io/vitess/go/tb" + "vitess.io/vitess/go/vt/log" ) const ( diff --git a/go/proc/proc.go b/go/proc/proc.go index c119bdc6f68..79d8d6b0526 100644 --- a/go/proc/proc.go +++ b/go/proc/proc.go @@ -30,7 +30,7 @@ import ( "syscall" "time" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) const pidURL = "/debug/pid" diff --git a/go/stats/export.go b/go/stats/export.go index 6c1d57be749..32c66734540 100644 --- a/go/stats/export.go +++ b/go/stats/export.go @@ -36,8 +36,8 @@ import ( "sync" "time" - log "github.com/golang/glog" "vitess.io/vitess/go/sync2" + "vitess.io/vitess/go/vt/log" ) var emitStats = flag.Bool("emit_stats", false, "true iff we should emit stats to push-based monitoring/stats backends") diff --git a/go/stats/influxdbbackend/influxdb_backend.go b/go/stats/influxdbbackend/influxdb_backend.go index 1fe3705403f..cd1c522b6f7 100644 --- a/go/stats/influxdbbackend/influxdb_backend.go +++ b/go/stats/influxdbbackend/influxdb_backend.go @@ -28,9 +28,9 @@ import ( "expvar" "flag" - log "github.com/golang/glog" influxClient "github.com/influxdb/influxdb/client" "vitess.io/vitess/go/stats" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/servenv" ) diff --git a/go/stats/promstats/collector.go b/go/stats/promstats/collector.go index c1794404308..2369e8e2faf 100644 --- a/go/stats/promstats/collector.go +++ b/go/stats/promstats/collector.go @@ -25,9 +25,9 @@ import ( "strings" "time" - log "github.com/golang/glog" "github.com/prometheus/client_golang/prometheus" "vitess.io/vitess/go/stats" + "vitess.io/vitess/go/vt/log" ) // NewCollector returns a prometheus.Collector for a given stats var. diff --git a/go/streamlog/streamlog.go b/go/streamlog/streamlog.go index 50e9b3418d7..d570229d8f6 100644 --- a/go/streamlog/streamlog.go +++ b/go/streamlog/streamlog.go @@ -28,9 +28,9 @@ import ( "sync" "syscall" - log "github.com/golang/glog" "vitess.io/vitess/go/acl" "vitess.io/vitess/go/stats" + "vitess.io/vitess/go/vt/log" ) var ( diff --git a/go/vt/automation/scheduler.go b/go/vt/automation/scheduler.go index a5e4282c449..08d712189a1 100644 --- a/go/vt/automation/scheduler.go +++ b/go/vt/automation/scheduler.go @@ -26,8 +26,8 @@ import ( "fmt" "sync" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" automationpb "vitess.io/vitess/go/vt/proto/automation" ) diff --git a/go/vt/automation/vtctlclient_wrapper.go b/go/vt/automation/vtctlclient_wrapper.go index a42a1f5c67a..97c185177c1 100644 --- a/go/vt/automation/vtctlclient_wrapper.go +++ b/go/vt/automation/vtctlclient_wrapper.go @@ -21,9 +21,8 @@ import ( "fmt" "time" - log "github.com/golang/glog" - "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/vtctl/vtctlclient" diff --git a/go/vt/automation/vtworkerclient_wrapper.go b/go/vt/automation/vtworkerclient_wrapper.go index 078a8ef19ae..d5c8795927c 100644 --- a/go/vt/automation/vtworkerclient_wrapper.go +++ b/go/vt/automation/vtworkerclient_wrapper.go @@ -22,8 +22,7 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" - + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/worker/vtworkerclient" ) diff --git a/go/vt/binlog/binlog_streamer.go b/go/vt/binlog/binlog_streamer.go index e5ed24e1739..c00bc5c5e73 100644 --- a/go/vt/binlog/binlog_streamer.go +++ b/go/vt/binlog/binlog_streamer.go @@ -22,13 +22,13 @@ import ( "io" "strings" - log "github.com/golang/glog" "github.com/golang/protobuf/proto" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/stats" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vttablet/tabletserver/schema" diff --git a/go/vt/binlog/binlogplayer/binlog_player.go b/go/vt/binlog/binlogplayer/binlog_player.go index d3bb97d2e03..567f3dfc0da 100644 --- a/go/vt/binlog/binlogplayer/binlog_player.go +++ b/go/vt/binlog/binlogplayer/binlog_player.go @@ -25,7 +25,6 @@ import ( "sync" "time" - log "github.com/golang/glog" "github.com/golang/protobuf/proto" "golang.org/x/net/context" @@ -33,6 +32,7 @@ import ( "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/stats" "vitess.io/vitess/go/sync2" + "vitess.io/vitess/go/vt/log" binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata" topodatapb "vitess.io/vitess/go/vt/proto/topodata" diff --git a/go/vt/binlog/binlogplayer/client.go b/go/vt/binlog/binlogplayer/client.go index cc8cb383296..0da96f56ab2 100644 --- a/go/vt/binlog/binlogplayer/client.go +++ b/go/vt/binlog/binlogplayer/client.go @@ -19,9 +19,9 @@ package binlogplayer import ( "flag" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata" topodatapb "vitess.io/vitess/go/vt/proto/topodata" ) diff --git a/go/vt/binlog/binlogplayer/dbclient.go b/go/vt/binlog/binlogplayer/dbclient.go index 6a33fe7e3da..fb3652d1110 100644 --- a/go/vt/binlog/binlogplayer/dbclient.go +++ b/go/vt/binlog/binlogplayer/dbclient.go @@ -19,12 +19,12 @@ package binlogplayer import ( "fmt" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/vt/dbconfigs" + "vitess.io/vitess/go/vt/log" ) // DBClient is a real VtClient backed by a mysql connection. diff --git a/go/vt/binlog/event_streamer.go b/go/vt/binlog/event_streamer.go index 9b9cd0549ef..8aacd12d7d6 100644 --- a/go/vt/binlog/event_streamer.go +++ b/go/vt/binlog/event_streamer.go @@ -22,11 +22,11 @@ import ( "strconv" "strings" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/sqltypes" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vttablet/tabletserver/schema" diff --git a/go/vt/binlog/keyrange_filter.go b/go/vt/binlog/keyrange_filter.go index f30dc9437d4..25df88a00b4 100644 --- a/go/vt/binlog/keyrange_filter.go +++ b/go/vt/binlog/keyrange_filter.go @@ -17,8 +17,8 @@ limitations under the License. package binlog import ( - log "github.com/golang/glog" "vitess.io/vitess/go/vt/key" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlannotation" "errors" diff --git a/go/vt/binlog/slave_connection.go b/go/vt/binlog/slave_connection.go index f0412792550..9b2222201f2 100644 --- a/go/vt/binlog/slave_connection.go +++ b/go/vt/binlog/slave_connection.go @@ -20,12 +20,12 @@ import ( "fmt" "sync" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/pools" "vitess.io/vitess/go/vt/dbconfigs" + "vitess.io/vitess/go/vt/log" ) var ( diff --git a/go/vt/binlog/tables_filter.go b/go/vt/binlog/tables_filter.go index b5dee91b268..993fc82ff3a 100644 --- a/go/vt/binlog/tables_filter.go +++ b/go/vt/binlog/tables_filter.go @@ -19,7 +19,7 @@ package binlog import ( "strings" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata" querypb "vitess.io/vitess/go/vt/proto/query" diff --git a/go/vt/binlog/updatestreamctl.go b/go/vt/binlog/updatestreamctl.go index a628d926ffd..6045d8a4e02 100644 --- a/go/vt/binlog/updatestreamctl.go +++ b/go/vt/binlog/updatestreamctl.go @@ -20,13 +20,13 @@ import ( "fmt" "sync" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/stats" "vitess.io/vitess/go/sync2" "vitess.io/vitess/go/tb" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/vttablet/tabletserver/schema" diff --git a/go/vt/concurrency/error_recorder.go b/go/vt/concurrency/error_recorder.go index ccf4e95dce6..5f6c600e7e8 100644 --- a/go/vt/concurrency/error_recorder.go +++ b/go/vt/concurrency/error_recorder.go @@ -21,7 +21,7 @@ import ( "strings" "sync" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) // ErrorRecorder offers a way to record errors during complex diff --git a/go/vt/dbconfigs/credentials.go b/go/vt/dbconfigs/credentials.go index 755475c493a..63116542761 100644 --- a/go/vt/dbconfigs/credentials.go +++ b/go/vt/dbconfigs/credentials.go @@ -28,8 +28,8 @@ import ( "io/ioutil" "sync" - log "github.com/golang/glog" "vitess.io/vitess/go/mysql" + "vitess.io/vitess/go/vt/log" ) var ( diff --git a/go/vt/dbconfigs/dbconfigs.go b/go/vt/dbconfigs/dbconfigs.go index 1f0a710dd97..f3cfda72ad5 100644 --- a/go/vt/dbconfigs/dbconfigs.go +++ b/go/vt/dbconfigs/dbconfigs.go @@ -23,9 +23,8 @@ import ( "flag" "fmt" - log "github.com/golang/glog" - "vitess.io/vitess/go/mysql" + "vitess.io/vitess/go/vt/log" ) // We keep a global singleton for the db configs, and that's the one diff --git a/go/vt/discovery/healthcheck.go b/go/vt/discovery/healthcheck.go index 52f8041a37d..c99d3ec70c8 100644 --- a/go/vt/discovery/healthcheck.go +++ b/go/vt/discovery/healthcheck.go @@ -47,13 +47,13 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "github.com/golang/protobuf/proto" "vitess.io/vitess/go/netutil" "vitess.io/vitess/go/stats" "vitess.io/vitess/go/vt/grpcclient" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo/topoproto" "vitess.io/vitess/go/vt/topotools" "vitess.io/vitess/go/vt/vttablet/queryservice" diff --git a/go/vt/discovery/tablet_stats_cache.go b/go/vt/discovery/tablet_stats_cache.go index b6f4b865650..96acb1faab9 100644 --- a/go/vt/discovery/tablet_stats_cache.go +++ b/go/vt/discovery/tablet_stats_cache.go @@ -20,8 +20,8 @@ import ( "math" "sync" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" querypb "vitess.io/vitess/go/vt/proto/query" topodatapb "vitess.io/vitess/go/vt/proto/topodata" "vitess.io/vitess/go/vt/srvtopo" diff --git a/go/vt/discovery/topology_watcher.go b/go/vt/discovery/topology_watcher.go index bea27ac8235..4629e97434e 100644 --- a/go/vt/discovery/topology_watcher.go +++ b/go/vt/discovery/topology_watcher.go @@ -22,10 +22,10 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/vt/key" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/topo/topoproto" diff --git a/go/vt/grpcclient/client.go b/go/vt/grpcclient/client.go index 04626246b9e..d8fd5cf9f96 100644 --- a/go/vt/grpcclient/client.go +++ b/go/vt/grpcclient/client.go @@ -25,7 +25,7 @@ import ( "vitess.io/vitess/go/vt/grpccommon" "vitess.io/vitess/go/vt/vttls" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) // FailFast is a self-documenting type for the grpc.FailFast. diff --git a/go/vt/grpcclient/glogger.go b/go/vt/grpcclient/glogger.go index 07556e3f76f..02b7fa2f20f 100644 --- a/go/vt/grpcclient/glogger.go +++ b/go/vt/grpcclient/glogger.go @@ -19,8 +19,8 @@ package grpcclient import ( "fmt" - log "github.com/golang/glog" "google.golang.org/grpc/grpclog" + "vitess.io/vitess/go/vt/log" ) // grpc doesn't return underlying errors. So, we have diff --git a/go/vt/hook/hook.go b/go/vt/hook/hook.go index 0094846c941..c2844b3f362 100644 --- a/go/vt/hook/hook.go +++ b/go/vt/hook/hook.go @@ -26,8 +26,8 @@ import ( "strings" "syscall" - log "github.com/golang/glog" vtenv "vitess.io/vitess/go/vt/env" + "vitess.io/vitess/go/vt/log" ) // Hook is the input structure for this library. diff --git a/go/vt/log/log.go b/go/vt/log/log.go new file mode 100644 index 00000000000..2a6b9a3b3a8 --- /dev/null +++ b/go/vt/log/log.go @@ -0,0 +1,56 @@ +// You can modify this file to hook up a different logging library instead of glog. +// If you adapt to a different logging framework, you may need to use that +// framework's equivalent of *Depth() functions so the file and line number printed +// point to the real caller instead of your adapter function. + +package log + +import ( + glog "github.com/golang/glog" +) + +// Level is used with V() to test log verbosity. +type Level = glog.Level + +var ( + // V quickly checks if the logging verbosity meets a threshold. + V = glog.V + + // Flush ensures any pending I/O is written. + Flush = glog.Flush + + // Info formats arguments like fmt.Print. + Info = glog.Info + // Infof formats arguments like fmt.Printf. + Infof = glog.Infof + // InfoDepth formats arguments like fmt.Print and uses depth to choose which call frame to log. + InfoDepth = glog.InfoDepth + + // Warning formats arguments like fmt.Print. + Warning = glog.Warning + // Warningf formats arguments like fmt.Printf. + Warningf = glog.Warningf + // WarningDepth formats arguments like fmt.Print and uses depth to choose which call frame to log. + WarningDepth = glog.WarningDepth + + // Error formats arguments like fmt.Print. + Error = glog.Error + // Errorf formats arguments like fmt.Printf. + Errorf = glog.Errorf + // ErrorDepth formats arguments like fmt.Print and uses depth to choose which call frame to log. + ErrorDepth = glog.ErrorDepth + + // Exit formats arguments like fmt.Print. + Exit = glog.Exit + // Exitf formats arguments like fmt.Printf. + Exitf = glog.Exitf + // ExitDepth formats arguments like fmt.Print and uses depth to choose which call frame to log. + ExitDepth = glog.ExitDepth + + // Fatal formats arguments like fmt.Print. + Fatal = glog.Fatal + // Fatalf formats arguments like fmt.Printf + Fatalf = glog.Fatalf + // FatalDepth formats arguments like fmt.Print and uses depth to choose which call frame to log. + FatalDepth = glog.FatalDepth +) diff --git a/go/vt/logutil/console_logger.go b/go/vt/logutil/console_logger.go index 305439903f5..ba9f752f234 100644 --- a/go/vt/logutil/console_logger.go +++ b/go/vt/logutil/console_logger.go @@ -19,7 +19,7 @@ package logutil import ( "fmt" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) // ConsoleLogger is a Logger that uses glog directly to log, at the right level. diff --git a/go/vt/logutil/flush_glog.go b/go/vt/logutil/flush_glog.go index ecc5ee302f7..597b8f6639f 100644 --- a/go/vt/logutil/flush_glog.go +++ b/go/vt/logutil/flush_glog.go @@ -17,7 +17,7 @@ limitations under the License. package logutil import ( - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) func init() { diff --git a/go/vt/logutil/logutil.go b/go/vt/logutil/logutil.go index efd0facbfdc..6d1aa98edf4 100644 --- a/go/vt/logutil/logutil.go +++ b/go/vt/logutil/logutil.go @@ -22,7 +22,7 @@ package logutil import ( stdlog "log" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) type logShim struct{} diff --git a/go/vt/logutil/throttled.go b/go/vt/logutil/throttled.go index 97cdf8504d3..c90763fdc66 100644 --- a/go/vt/logutil/throttled.go +++ b/go/vt/logutil/throttled.go @@ -21,7 +21,7 @@ import ( "sync" "time" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) // ThrottledLogger will allow logging of messages but won't spam the diff --git a/go/vt/mysqlctl/backup.go b/go/vt/mysqlctl/backup.go index ea4e195a445..e1cd194e222 100644 --- a/go/vt/mysqlctl/backup.go +++ b/go/vt/mysqlctl/backup.go @@ -30,7 +30,6 @@ import ( "strings" "sync" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/cgzip" @@ -39,6 +38,7 @@ import ( "vitess.io/vitess/go/sync2" "vitess.io/vitess/go/vt/concurrency" "vitess.io/vitess/go/vt/hook" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/mysqlctl/backupstorage" ) diff --git a/go/vt/mysqlctl/cephbackupstorage/ceph.go b/go/vt/mysqlctl/cephbackupstorage/ceph.go index 8d7d05c5537..5f2d9277baa 100644 --- a/go/vt/mysqlctl/cephbackupstorage/ceph.go +++ b/go/vt/mysqlctl/cephbackupstorage/ceph.go @@ -30,11 +30,11 @@ import ( "errors" - log "github.com/golang/glog" minio "github.com/minio/minio-go" "golang.org/x/net/context" "vitess.io/vitess/go/vt/concurrency" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/mysqlctl/backupstorage" ) diff --git a/go/vt/mysqlctl/metadata_tables.go b/go/vt/mysqlctl/metadata_tables.go index 02d2b749417..ac911ccfdbc 100644 --- a/go/vt/mysqlctl/metadata_tables.go +++ b/go/vt/mysqlctl/metadata_tables.go @@ -19,9 +19,8 @@ package mysqlctl import ( "bytes" - log "github.com/golang/glog" - "vitess.io/vitess/go/sqltypes" + "vitess.io/vitess/go/vt/log" ) // Note that definitions of local_metadata and shard_metadata should be the same diff --git a/go/vt/mysqlctl/mycnf_flag.go b/go/vt/mysqlctl/mycnf_flag.go index 732ba618414..031d0869708 100644 --- a/go/vt/mysqlctl/mycnf_flag.go +++ b/go/vt/mysqlctl/mycnf_flag.go @@ -19,7 +19,7 @@ package mysqlctl import ( "flag" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) // This file handles using command line flags to create a Mycnf object. diff --git a/go/vt/mysqlctl/mysqlctlclient/interface.go b/go/vt/mysqlctl/mysqlctlclient/interface.go index eb24e5c9757..c5ba0be1bbe 100644 --- a/go/vt/mysqlctl/mysqlctlclient/interface.go +++ b/go/vt/mysqlctl/mysqlctlclient/interface.go @@ -22,8 +22,8 @@ import ( "flag" "fmt" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" ) var protocol = flag.String("mysqlctl_client_protocol", "grpc", "the protocol to use to talk to the mysqlctl server") diff --git a/go/vt/mysqlctl/mysqld.go b/go/vt/mysqlctl/mysqld.go index 63230d48242..4b4ab9ad4fa 100644 --- a/go/vt/mysqlctl/mysqld.go +++ b/go/vt/mysqlctl/mysqld.go @@ -40,7 +40,6 @@ import ( "bytes" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/stats" @@ -48,6 +47,7 @@ import ( "vitess.io/vitess/go/vt/dbconnpool" vtenv "vitess.io/vitess/go/vt/env" "vitess.io/vitess/go/vt/hook" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/mysqlctl/mysqlctlclient" ) diff --git a/go/vt/mysqlctl/query.go b/go/vt/mysqlctl/query.go index c88913e142e..8d98b65585f 100644 --- a/go/vt/mysqlctl/query.go +++ b/go/vt/mysqlctl/query.go @@ -23,10 +23,10 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/vt/dbconnpool" + "vitess.io/vitess/go/vt/log" ) // getPoolReconnect gets a connection from a pool, tests it, and reconnects if diff --git a/go/vt/mysqlctl/replication.go b/go/vt/mysqlctl/replication.go index 7c28e863bd0..ba435211850 100644 --- a/go/vt/mysqlctl/replication.go +++ b/go/vt/mysqlctl/replication.go @@ -26,7 +26,6 @@ import ( "strings" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" @@ -34,6 +33,7 @@ import ( "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/vt/dbconfigs" "vitess.io/vitess/go/vt/hook" + "vitess.io/vitess/go/vt/log" ) const ( diff --git a/go/vt/mysqlctl/schema.go b/go/vt/mysqlctl/schema.go index 18ed3e5e273..5d65ec239ef 100644 --- a/go/vt/mysqlctl/schema.go +++ b/go/vt/mysqlctl/schema.go @@ -21,12 +21,12 @@ import ( "regexp" "strings" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/sqlescape" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/vt/dbconfigs" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/mysqlctl/tmutils" tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata" diff --git a/go/vt/mysqlctl/utils.go b/go/vt/mysqlctl/utils.go index c419182bfb9..ce147e8250d 100644 --- a/go/vt/mysqlctl/utils.go +++ b/go/vt/mysqlctl/utils.go @@ -17,7 +17,7 @@ limitations under the License. package mysqlctl import ( - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) type MapFunc func(index int) error diff --git a/go/vt/mysqlproxy/mysqlproxy.go b/go/vt/mysqlproxy/mysqlproxy.go index ff20d5b7d48..b66004f31cf 100644 --- a/go/vt/mysqlproxy/mysqlproxy.go +++ b/go/vt/mysqlproxy/mysqlproxy.go @@ -23,9 +23,8 @@ import ( "context" "fmt" - log "github.com/golang/glog" - "vitess.io/vitess/go/sqltypes" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vttablet/queryservice" diff --git a/go/vt/schemamanager/local_controller.go b/go/vt/schemamanager/local_controller.go index d5ac35b2d92..fb1fabc4744 100644 --- a/go/vt/schemamanager/local_controller.go +++ b/go/vt/schemamanager/local_controller.go @@ -24,8 +24,8 @@ import ( "strings" "time" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" ) // LocalController listens to the specified schema change dir and applies schema changes. diff --git a/go/vt/schemamanager/plain_controller.go b/go/vt/schemamanager/plain_controller.go index b26737b34d7..b4709b1e2a2 100644 --- a/go/vt/schemamanager/plain_controller.go +++ b/go/vt/schemamanager/plain_controller.go @@ -20,9 +20,9 @@ import ( "encoding/json" "strings" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" ) diff --git a/go/vt/schemamanager/schemamanager.go b/go/vt/schemamanager/schemamanager.go index b1d6501dc62..1f381f0dad1 100644 --- a/go/vt/schemamanager/schemamanager.go +++ b/go/vt/schemamanager/schemamanager.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" querypb "vitess.io/vitess/go/vt/proto/query" ) diff --git a/go/vt/schemamanager/schemaswap/schema_swap.go b/go/vt/schemamanager/schemaswap/schema_swap.go index 711f53e4a22..6b39ccfb210 100644 --- a/go/vt/schemamanager/schemaswap/schema_swap.go +++ b/go/vt/schemamanager/schemaswap/schema_swap.go @@ -27,13 +27,13 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/vt/concurrency" "vitess.io/vitess/go/vt/discovery" "vitess.io/vitess/go/vt/hook" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/mysqlctl" topodatapb "vitess.io/vitess/go/vt/proto/topodata" diff --git a/go/vt/schemamanager/ui_controller.go b/go/vt/schemamanager/ui_controller.go index 5a129ee2602..909693a4a05 100644 --- a/go/vt/schemamanager/ui_controller.go +++ b/go/vt/schemamanager/ui_controller.go @@ -22,8 +22,8 @@ import ( "net/http" "strings" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" ) // UIController handles schema events. diff --git a/go/vt/servenv/grpc_auth.go b/go/vt/servenv/grpc_auth.go index 4093ff64f94..42bcfbc7073 100644 --- a/go/vt/servenv/grpc_auth.go +++ b/go/vt/servenv/grpc_auth.go @@ -23,7 +23,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) // Authenticator provides an interface to implement auth in Vitess in diff --git a/go/vt/servenv/grpc_server.go b/go/vt/servenv/grpc_server.go index 78e107ddd3d..b3a729eed52 100644 --- a/go/vt/servenv/grpc_server.go +++ b/go/vt/servenv/grpc_server.go @@ -27,10 +27,10 @@ import ( "math" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "google.golang.org/grpc/keepalive" "vitess.io/vitess/go/vt/grpccommon" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/vttls" ) diff --git a/go/vt/servenv/grpc_server_auth_static.go b/go/vt/servenv/grpc_server_auth_static.go index 5b0034294a2..adf0a719266 100644 --- a/go/vt/servenv/grpc_server_auth_static.go +++ b/go/vt/servenv/grpc_server_auth_static.go @@ -27,7 +27,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) var ( diff --git a/go/vt/servenv/pid_file.go b/go/vt/servenv/pid_file.go index b4f91679939..ec06a4a0a95 100644 --- a/go/vt/servenv/pid_file.go +++ b/go/vt/servenv/pid_file.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) var pidFile = flag.String("pid_file", "", "If set, the process will write its pid to the named file, and delete it on graceful shutdown.") diff --git a/go/vt/servenv/pprof.go b/go/vt/servenv/pprof.go index 695a0ffdf54..cf61f8e2734 100644 --- a/go/vt/servenv/pprof.go +++ b/go/vt/servenv/pprof.go @@ -21,7 +21,7 @@ import ( "os" "runtime/pprof" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) var ( diff --git a/go/vt/servenv/run.go b/go/vt/servenv/run.go index c9af583f0f5..1faf5af05ea 100644 --- a/go/vt/servenv/run.go +++ b/go/vt/servenv/run.go @@ -22,9 +22,9 @@ import ( "net/url" "time" - log "github.com/golang/glog" "vitess.io/vitess/go/event" "vitess.io/vitess/go/proc" + "vitess.io/vitess/go/vt/log" ) var ( diff --git a/go/vt/servenv/servenv.go b/go/vt/servenv/servenv.go index 140ecf4b8e6..eca091d29c4 100644 --- a/go/vt/servenv/servenv.go +++ b/go/vt/servenv/servenv.go @@ -41,10 +41,10 @@ import ( // register the HTTP handlers for profiling _ "net/http/pprof" - log "github.com/golang/glog" "vitess.io/vitess/go/event" "vitess.io/vitess/go/netutil" "vitess.io/vitess/go/stats" + "vitess.io/vitess/go/vt/log" // register the proper init and shutdown hooks for logging _ "vitess.io/vitess/go/vt/logutil" diff --git a/go/vt/servenv/service_map.go b/go/vt/servenv/service_map.go index ab05d296bda..e9bcdbee4b3 100644 --- a/go/vt/servenv/service_map.go +++ b/go/vt/servenv/service_map.go @@ -19,9 +19,8 @@ package servenv import ( "flag" - log "github.com/golang/glog" - "vitess.io/vitess/go/flagutil" + "vitess.io/vitess/go/vt/log" ) var ( diff --git a/go/vt/servenv/status.go b/go/vt/servenv/status.go index 18263aa7169..c48bdc10d99 100644 --- a/go/vt/servenv/status.go +++ b/go/vt/servenv/status.go @@ -29,8 +29,8 @@ import ( "sync" "time" - log "github.com/golang/glog" "vitess.io/vitess/go/acl" + "vitess.io/vitess/go/vt/log" ) var ( diff --git a/go/vt/servenv/unix_socket.go b/go/vt/servenv/unix_socket.go index a310a243f5a..ad247fd063b 100644 --- a/go/vt/servenv/unix_socket.go +++ b/go/vt/servenv/unix_socket.go @@ -21,7 +21,7 @@ import ( "net" "os" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) var ( diff --git a/go/vt/sqlparser/ast.go b/go/vt/sqlparser/ast.go index 80bff834967..99323b5c682 100644 --- a/go/vt/sqlparser/ast.go +++ b/go/vt/sqlparser/ast.go @@ -24,9 +24,8 @@ import ( "io" "strings" - log "github.com/golang/glog" - "vitess.io/vitess/go/sqltypes" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/vterrors" querypb "vitess.io/vitess/go/vt/proto/query" diff --git a/go/vt/srvtopo/discover.go b/go/vt/srvtopo/discover.go index d27e29ba179..a11b0880261 100644 --- a/go/vt/srvtopo/discover.go +++ b/go/vt/srvtopo/discover.go @@ -19,10 +19,10 @@ package srvtopo import ( "sync" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/vt/concurrency" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" querypb "vitess.io/vitess/go/vt/proto/query" diff --git a/go/vt/srvtopo/resilient_server.go b/go/vt/srvtopo/resilient_server.go index 8252401fe61..8c5e05e2202 100644 --- a/go/vt/srvtopo/resilient_server.go +++ b/go/vt/srvtopo/resilient_server.go @@ -24,10 +24,10 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/stats" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" topodatapb "vitess.io/vitess/go/vt/proto/topodata" diff --git a/go/vt/tableacl/tableacl.go b/go/vt/tableacl/tableacl.go index d834dc1882f..8e4624a43ab 100644 --- a/go/vt/tableacl/tableacl.go +++ b/go/vt/tableacl/tableacl.go @@ -25,11 +25,11 @@ import ( "strings" "sync" - log "github.com/golang/glog" "github.com/golang/protobuf/proto" "github.com/tchap/go-patricia/patricia" "vitess.io/vitess/go/json2" "vitess.io/vitess/go/vt/health" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/tableacl/acl" "vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv" diff --git a/go/vt/throttler/demo/throttler_demo.go b/go/vt/throttler/demo/throttler_demo.go index fd28326b3b7..77d61e1fcdd 100644 --- a/go/vt/throttler/demo/throttler_demo.go +++ b/go/vt/throttler/demo/throttler_demo.go @@ -38,7 +38,7 @@ import ( querypb "vitess.io/vitess/go/vt/proto/query" topodatapb "vitess.io/vitess/go/vt/proto/topodata" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) // This file contains a demo binary that demonstrates how the resharding diff --git a/go/vt/throttler/manager.go b/go/vt/throttler/manager.go index f10d925ce1a..bbc3f987d98 100644 --- a/go/vt/throttler/manager.go +++ b/go/vt/throttler/manager.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" throttlerdatapb "vitess.io/vitess/go/vt/proto/throttlerdata" ) diff --git a/go/vt/throttler/max_replication_lag_module.go b/go/vt/throttler/max_replication_lag_module.go index 5b8572242a4..549d2619f8a 100644 --- a/go/vt/throttler/max_replication_lag_module.go +++ b/go/vt/throttler/max_replication_lag_module.go @@ -22,11 +22,11 @@ import ( "sync" "time" - log "github.com/golang/glog" "github.com/golang/protobuf/proto" "vitess.io/vitess/go/sync2" "vitess.io/vitess/go/vt/discovery" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo/topoproto" throttlerdatapb "vitess.io/vitess/go/vt/proto/throttlerdata" diff --git a/go/vt/throttler/throttler.go b/go/vt/throttler/throttler.go index a2228bbc369..179b6f1059f 100644 --- a/go/vt/throttler/throttler.go +++ b/go/vt/throttler/throttler.go @@ -33,9 +33,8 @@ import ( "sync" "time" - log "github.com/golang/glog" - "vitess.io/vitess/go/vt/discovery" + "vitess.io/vitess/go/vt/log" throttlerdatapb "vitess.io/vitess/go/vt/proto/throttlerdata" ) diff --git a/go/vt/tlstest/tlstest.go b/go/vt/tlstest/tlstest.go index cd94b439161..d110dd8215e 100644 --- a/go/vt/tlstest/tlstest.go +++ b/go/vt/tlstest/tlstest.go @@ -25,7 +25,7 @@ import ( "os/exec" "path" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) const ( diff --git a/go/vt/topo/consultopo/election.go b/go/vt/topo/consultopo/election.go index 21b6611ae09..d1dde1c4629 100644 --- a/go/vt/topo/consultopo/election.go +++ b/go/vt/topo/consultopo/election.go @@ -19,10 +19,10 @@ package consultopo import ( "path" - log "github.com/golang/glog" "golang.org/x/net/context" "github.com/hashicorp/consul/api" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" ) diff --git a/go/vt/topo/consultopo/lock.go b/go/vt/topo/consultopo/lock.go index 1392615d4d2..063c2e62489 100644 --- a/go/vt/topo/consultopo/lock.go +++ b/go/vt/topo/consultopo/lock.go @@ -20,10 +20,10 @@ import ( "fmt" "path" - log "github.com/golang/glog" "github.com/hashicorp/consul/api" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" ) diff --git a/go/vt/topo/etcd2topo/election.go b/go/vt/topo/etcd2topo/election.go index 8df267add6a..743312892dc 100644 --- a/go/vt/topo/etcd2topo/election.go +++ b/go/vt/topo/etcd2topo/election.go @@ -20,9 +20,9 @@ import ( "path" "github.com/coreos/etcd/clientv3" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" ) diff --git a/go/vt/topo/etcd2topo/lock.go b/go/vt/topo/etcd2topo/lock.go index 8add21904d9..f41224f29fb 100644 --- a/go/vt/topo/etcd2topo/lock.go +++ b/go/vt/topo/etcd2topo/lock.go @@ -23,9 +23,9 @@ import ( "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/mvcc/mvccpb" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" ) diff --git a/go/vt/topo/etcd2topo/watch.go b/go/vt/topo/etcd2topo/watch.go index 12029a35842..797a4255b93 100644 --- a/go/vt/topo/etcd2topo/watch.go +++ b/go/vt/topo/etcd2topo/watch.go @@ -24,8 +24,8 @@ import ( "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/mvcc/mvccpb" "golang.org/x/net/context" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" ) diff --git a/go/vt/topo/helpers/copy.go b/go/vt/topo/helpers/copy.go index e636b2f09fd..d4514c35499 100644 --- a/go/vt/topo/helpers/copy.go +++ b/go/vt/topo/helpers/copy.go @@ -22,9 +22,9 @@ import ( "fmt" "sync" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/vt/concurrency" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" topodatapb "vitess.io/vitess/go/vt/proto/topodata" diff --git a/go/vt/topo/helpers/tee.go b/go/vt/topo/helpers/tee.go index 30bf8df2dd1..1a7221ac0a1 100644 --- a/go/vt/topo/helpers/tee.go +++ b/go/vt/topo/helpers/tee.go @@ -17,8 +17,8 @@ limitations under the License. package helpers import ( - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" ) diff --git a/go/vt/topo/keyspace.go b/go/vt/topo/keyspace.go index 02adfc279b6..49a5eef2e5a 100644 --- a/go/vt/topo/keyspace.go +++ b/go/vt/topo/keyspace.go @@ -21,12 +21,12 @@ import ( "path" "sync" - log "github.com/golang/glog" "github.com/golang/protobuf/proto" "golang.org/x/net/context" "vitess.io/vitess/go/event" "vitess.io/vitess/go/vt/concurrency" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo/events" topodatapb "vitess.io/vitess/go/vt/proto/topodata" diff --git a/go/vt/topo/locks.go b/go/vt/topo/locks.go index 5a08888294a..474e1561fea 100644 --- a/go/vt/topo/locks.go +++ b/go/vt/topo/locks.go @@ -26,10 +26,10 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/trace" + "vitess.io/vitess/go/vt/log" ) // This file contains utility methods and definitions to lock diff --git a/go/vt/topo/memorytopo/election.go b/go/vt/topo/memorytopo/election.go index 24df9761b06..1caffbd1d7e 100644 --- a/go/vt/topo/memorytopo/election.go +++ b/go/vt/topo/memorytopo/election.go @@ -19,9 +19,9 @@ package memorytopo import ( "path" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" ) diff --git a/go/vt/topo/memorytopo/memorytopo.go b/go/vt/topo/memorytopo/memorytopo.go index 9412d6aad7c..05e28c6543d 100644 --- a/go/vt/topo/memorytopo/memorytopo.go +++ b/go/vt/topo/memorytopo/memorytopo.go @@ -25,9 +25,9 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" topodatapb "vitess.io/vitess/go/vt/proto/topodata" diff --git a/go/vt/topo/replication.go b/go/vt/topo/replication.go index 167401d90e1..edb7d4f4a55 100644 --- a/go/vt/topo/replication.go +++ b/go/vt/topo/replication.go @@ -20,11 +20,11 @@ import ( "fmt" "path" - log "github.com/golang/glog" "github.com/golang/protobuf/proto" "golang.org/x/net/context" "vitess.io/vitess/go/trace" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/topo/topoproto" diff --git a/go/vt/topo/server.go b/go/vt/topo/server.go index c14b5e335aa..b5c5a236de5 100644 --- a/go/vt/topo/server.go +++ b/go/vt/topo/server.go @@ -48,8 +48,8 @@ import ( "fmt" "sync" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" ) const ( diff --git a/go/vt/topo/shard.go b/go/vt/topo/shard.go index 232aee403a1..4048d7f48e5 100644 --- a/go/vt/topo/shard.go +++ b/go/vt/topo/shard.go @@ -27,13 +27,13 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" "github.com/golang/protobuf/proto" "vitess.io/vitess/go/event" "vitess.io/vitess/go/trace" "vitess.io/vitess/go/vt/concurrency" "vitess.io/vitess/go/vt/key" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo/events" "vitess.io/vitess/go/vt/topo/topoproto" diff --git a/go/vt/topo/tablet.go b/go/vt/topo/tablet.go index 6e917ee07cf..08bb87fd522 100644 --- a/go/vt/topo/tablet.go +++ b/go/vt/topo/tablet.go @@ -23,11 +23,11 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" "github.com/golang/protobuf/proto" "vitess.io/vitess/go/event" "vitess.io/vitess/go/netutil" "vitess.io/vitess/go/trace" + "vitess.io/vitess/go/vt/log" topodatapb "vitess.io/vitess/go/vt/proto/topodata" "vitess.io/vitess/go/vt/topo/events" diff --git a/go/vt/topo/wildcards.go b/go/vt/topo/wildcards.go index b95a1d531fa..54c428745f7 100644 --- a/go/vt/topo/wildcards.go +++ b/go/vt/topo/wildcards.go @@ -22,10 +22,10 @@ import ( "strings" "sync" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/fileutil" + "vitess.io/vitess/go/vt/log" ) // ResolveKeyspaceWildcard will resolve keyspace wildcards. diff --git a/go/vt/topo/zk2topo/election.go b/go/vt/topo/zk2topo/election.go index 2b8452c7067..9a5fc545310 100644 --- a/go/vt/topo/zk2topo/election.go +++ b/go/vt/topo/zk2topo/election.go @@ -21,10 +21,10 @@ import ( "path" "sort" - log "github.com/golang/glog" "github.com/samuel/go-zookeeper/zk" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" ) diff --git a/go/vt/topo/zk2topo/lock.go b/go/vt/topo/zk2topo/lock.go index 1a052d29d49..380209834e7 100644 --- a/go/vt/topo/zk2topo/lock.go +++ b/go/vt/topo/zk2topo/lock.go @@ -20,10 +20,10 @@ import ( "fmt" "path" - log "github.com/golang/glog" "github.com/samuel/go-zookeeper/zk" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" ) diff --git a/go/vt/topo/zk2topo/utils.go b/go/vt/topo/zk2topo/utils.go index 88557c7dc5e..21c3895473c 100644 --- a/go/vt/topo/zk2topo/utils.go +++ b/go/vt/topo/zk2topo/utils.go @@ -23,9 +23,9 @@ import ( "strings" "sync" - log "github.com/golang/glog" "github.com/samuel/go-zookeeper/zk" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/fileutil" ) diff --git a/go/vt/topo/zk2topo/zk_conn.go b/go/vt/topo/zk2topo/zk_conn.go index ec9099613f7..507f5c02569 100644 --- a/go/vt/topo/zk2topo/zk_conn.go +++ b/go/vt/topo/zk2topo/zk_conn.go @@ -24,12 +24,12 @@ import ( "sync" "time" - log "github.com/golang/glog" "github.com/samuel/go-zookeeper/zk" "golang.org/x/net/context" "vitess.io/vitess/go/netutil" "vitess.io/vitess/go/sync2" + "vitess.io/vitess/go/vt/log" ) const ( diff --git a/go/vt/topotools/tablet.go b/go/vt/topotools/tablet.go index 7164dfdfd57..fa7b6ca7f4a 100644 --- a/go/vt/topotools/tablet.go +++ b/go/vt/topotools/tablet.go @@ -39,8 +39,8 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" "vitess.io/vitess/go/vt/hook" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/topo/topoproto" diff --git a/go/vt/topotools/utils.go b/go/vt/topotools/utils.go index b30166ca816..de503f44b7c 100644 --- a/go/vt/topotools/utils.go +++ b/go/vt/topotools/utils.go @@ -23,7 +23,7 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/topo/topoproto" diff --git a/go/vt/vtctl/vtctl.go b/go/vt/vtctl/vtctl.go index 1c80e306edb..f1e2cbfc262 100644 --- a/go/vt/vtctl/vtctl.go +++ b/go/vt/vtctl/vtctl.go @@ -104,7 +104,6 @@ import ( "sync" "time" - log "github.com/golang/glog" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" "golang.org/x/net/context" @@ -116,6 +115,7 @@ import ( "vitess.io/vitess/go/sync2" hk "vitess.io/vitess/go/vt/hook" "vitess.io/vitess/go/vt/key" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/schemamanager" "vitess.io/vitess/go/vt/topo" diff --git a/go/vt/vtctl/vtctlclient/interface.go b/go/vt/vtctl/vtctlclient/interface.go index 7a417d8dadd..634879eac38 100644 --- a/go/vt/vtctl/vtctlclient/interface.go +++ b/go/vt/vtctl/vtctlclient/interface.go @@ -22,9 +22,9 @@ import ( "fmt" "time" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" ) diff --git a/go/vt/vtctld/api.go b/go/vt/vtctld/api.go index 978a08742e2..fa87b950479 100644 --- a/go/vt/vtctld/api.go +++ b/go/vt/vtctld/api.go @@ -26,10 +26,10 @@ import ( "strings" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/acl" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/schemamanager" "vitess.io/vitess/go/vt/topo" diff --git a/go/vt/vtctld/tablet_data.go b/go/vt/vtctld/tablet_data.go index 116f954c3f0..07a3529b50c 100644 --- a/go/vt/vtctld/tablet_data.go +++ b/go/vt/vtctld/tablet_data.go @@ -22,10 +22,9 @@ import ( "sync" "time" - log "github.com/golang/glog" - "golang.org/x/net/context" "vitess.io/vitess/go/vt/grpcclient" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/topo/topoproto" "vitess.io/vitess/go/vt/vttablet/tabletconn" diff --git a/go/vt/vtctld/vtctld.go b/go/vt/vtctld/vtctld.go index 278df8738c2..96c7f13fc1a 100644 --- a/go/vt/vtctld/vtctld.go +++ b/go/vt/vtctld/vtctld.go @@ -25,8 +25,8 @@ import ( "path" "strings" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/acl" "vitess.io/vitess/go/vt/topo" diff --git a/go/vt/vtctld/workflow.go b/go/vt/vtctld/workflow.go index a41c9d6b652..3a0e31c1a29 100644 --- a/go/vt/vtctld/workflow.go +++ b/go/vt/vtctld/workflow.go @@ -20,10 +20,10 @@ import ( "flag" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/flagutil" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/schemamanager/schemaswap" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/topo" diff --git a/go/vt/vtexplain/vtexplain.go b/go/vt/vtexplain/vtexplain.go index 618890c19d3..e101bfe53c9 100644 --- a/go/vt/vtexplain/vtexplain.go +++ b/go/vt/vtexplain/vtexplain.go @@ -26,10 +26,9 @@ import ( "strings" "time" - log "github.com/golang/glog" - "vitess.io/vitess/go/jsonutil" "vitess.io/vitess/go/sync2" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vtgate/engine" diff --git a/go/vt/vtexplain/vtexplain_vtgate.go b/go/vt/vtexplain/vtexplain_vtgate.go index 04435512398..f2e914ccf84 100644 --- a/go/vt/vtexplain/vtexplain_vtgate.go +++ b/go/vt/vtexplain/vtexplain_vtgate.go @@ -23,11 +23,11 @@ import ( "encoding/json" "fmt" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/vt/discovery" "vitess.io/vitess/go/vt/key" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/srvtopo" "vitess.io/vitess/go/vt/vtgate" "vitess.io/vitess/go/vt/vtgate/engine" diff --git a/go/vt/vtexplain/vtexplain_vttablet.go b/go/vt/vtexplain/vtexplain_vttablet.go index df17473550f..6b03e0c87fb 100644 --- a/go/vt/vtexplain/vtexplain_vttablet.go +++ b/go/vt/vtexplain/vtexplain_vttablet.go @@ -24,13 +24,12 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" - "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/mysql/fakesqldb" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/sync2" "vitess.io/vitess/go/vt/dbconfigs" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/mysqlctl" "vitess.io/vitess/go/vt/sqlparser" diff --git a/go/vt/vtgate/buffer/buffer.go b/go/vt/vtgate/buffer/buffer.go index 6432659570f..ca9e9eeb399 100644 --- a/go/vt/vtgate/buffer/buffer.go +++ b/go/vt/vtgate/buffer/buffer.go @@ -32,11 +32,11 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/sync2" "vitess.io/vitess/go/vt/discovery" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo/topoproto" "vitess.io/vitess/go/vt/vterrors" diff --git a/go/vt/vtgate/buffer/shard_buffer.go b/go/vt/vtgate/buffer/shard_buffer.go index f936884a521..c6541722379 100644 --- a/go/vt/vtgate/buffer/shard_buffer.go +++ b/go/vt/vtgate/buffer/shard_buffer.go @@ -22,10 +22,10 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/sync2" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/topo/topoproto" "vitess.io/vitess/go/vt/vterrors" diff --git a/go/vt/vtgate/executor.go b/go/vt/vtgate/executor.go index 92b4c190b3c..b9e8b4d0cb0 100644 --- a/go/vt/vtgate/executor.go +++ b/go/vt/vtgate/executor.go @@ -28,7 +28,6 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/acl" @@ -37,6 +36,7 @@ import ( "vitess.io/vitess/go/stats" "vitess.io/vitess/go/vt/callerid" "vitess.io/vitess/go/vt/key" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlannotation" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/srvtopo" diff --git a/go/vt/vtgate/gateway/discoverygateway.go b/go/vt/vtgate/gateway/discoverygateway.go index 1bb2664b582..d870dccc459 100644 --- a/go/vt/vtgate/gateway/discoverygateway.go +++ b/go/vt/vtgate/gateway/discoverygateway.go @@ -25,11 +25,11 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/flagutil" "vitess.io/vitess/go/vt/discovery" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/srvtopo" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/vterrors" diff --git a/go/vt/vtgate/gateway/gateway.go b/go/vt/vtgate/gateway/gateway.go index c343f89a4b2..9296fe16a4c 100644 --- a/go/vt/vtgate/gateway/gateway.go +++ b/go/vt/vtgate/gateway/gateway.go @@ -23,8 +23,8 @@ import ( "fmt" "time" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/discovery" "vitess.io/vitess/go/vt/srvtopo" diff --git a/go/vt/vtgate/gateway/l2vtgateconn.go b/go/vt/vtgate/gateway/l2vtgateconn.go index 73b83c5bc6e..98bc23b9c88 100644 --- a/go/vt/vtgate/gateway/l2vtgateconn.go +++ b/go/vt/vtgate/gateway/l2vtgateconn.go @@ -22,9 +22,9 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/vt/grpcclient" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/topo/topoproto" "vitess.io/vitess/go/vt/vttablet/queryservice" diff --git a/go/vt/vtgate/l2vtgate.go b/go/vt/vtgate/l2vtgate.go index 9a73ffaa9a3..c842aac3bac 100644 --- a/go/vt/vtgate/l2vtgate.go +++ b/go/vt/vtgate/l2vtgate.go @@ -19,10 +19,10 @@ package vtgate import ( "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/stats" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/topo/topoproto" "vitess.io/vitess/go/vt/vterrors" diff --git a/go/vt/vtgate/plugin_mysql_server.go b/go/vt/vtgate/plugin_mysql_server.go index 37e9eff3549..7bdcbf01f40 100644 --- a/go/vt/vtgate/plugin_mysql_server.go +++ b/go/vt/vtgate/plugin_mysql_server.go @@ -25,12 +25,12 @@ import ( "syscall" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/vt/callerid" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/vttls" diff --git a/go/vt/vtgate/querylogz.go b/go/vt/vtgate/querylogz.go index 88fcd1a67d2..45ea0eca669 100644 --- a/go/vt/vtgate/querylogz.go +++ b/go/vt/vtgate/querylogz.go @@ -25,8 +25,8 @@ import ( "text/template" "time" - log "github.com/golang/glog" "vitess.io/vitess/go/acl" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logz" "vitess.io/vitess/go/vt/sqlparser" ) diff --git a/go/vt/vtgate/queryz.go b/go/vt/vtgate/queryz.go index 10f38d47af2..53833cadb40 100644 --- a/go/vt/vtgate/queryz.go +++ b/go/vt/vtgate/queryz.go @@ -23,8 +23,8 @@ import ( "sort" "time" - log "github.com/golang/glog" "vitess.io/vitess/go/acl" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logz" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vtgate/engine" diff --git a/go/vt/vtgate/tx_conn.go b/go/vt/vtgate/tx_conn.go index 3d6b40432cb..dc24513afd5 100644 --- a/go/vt/vtgate/tx_conn.go +++ b/go/vt/vtgate/tx_conn.go @@ -21,10 +21,9 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" - "vitess.io/vitess/go/vt/concurrency" "vitess.io/vitess/go/vt/dtids" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/vterrors" "vitess.io/vitess/go/vt/vtgate/gateway" diff --git a/go/vt/vtgate/vschema_manager.go b/go/vt/vtgate/vschema_manager.go index bec15628348..b6a0cc01bb5 100644 --- a/go/vt/vtgate/vschema_manager.go +++ b/go/vt/vtgate/vschema_manager.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - log "github.com/golang/glog" "github.com/golang/protobuf/proto" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/vtgate/vindexes" diff --git a/go/vt/vtgate/vtgate.go b/go/vt/vtgate/vtgate.go index da4a7536208..8f557f43988 100644 --- a/go/vt/vtgate/vtgate.go +++ b/go/vt/vtgate/vtgate.go @@ -25,7 +25,6 @@ import ( "net/http" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/acl" @@ -35,6 +34,7 @@ import ( "vitess.io/vitess/go/tb" "vitess.io/vitess/go/vt/discovery" "vitess.io/vitess/go/vt/key" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/sqlannotation" diff --git a/go/vt/vtgate/vtgateconn/vtgateconn.go b/go/vt/vtgate/vtgateconn/vtgateconn.go index 80ea5b84f74..235ec3a41bf 100644 --- a/go/vt/vtgate/vtgateconn/vtgateconn.go +++ b/go/vt/vtgate/vtgateconn/vtgateconn.go @@ -20,9 +20,9 @@ import ( "flag" "fmt" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/sqltypes" + "vitess.io/vitess/go/vt/log" querypb "vitess.io/vitess/go/vt/proto/query" topodatapb "vitess.io/vitess/go/vt/proto/topodata" diff --git a/go/vt/vtqueryserver/plugin_mysql_server.go b/go/vt/vtqueryserver/plugin_mysql_server.go index 91cb39a24f2..531d1e70754 100644 --- a/go/vt/vtqueryserver/plugin_mysql_server.go +++ b/go/vt/vtqueryserver/plugin_mysql_server.go @@ -23,12 +23,12 @@ import ( "os" "syscall" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/vt/callerid" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/mysqlproxy" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/vttls" diff --git a/go/vt/vtqueryserver/vtqueryserver.go b/go/vt/vtqueryserver/vtqueryserver.go index 34fc2901398..587046a1255 100644 --- a/go/vt/vtqueryserver/vtqueryserver.go +++ b/go/vt/vtqueryserver/vtqueryserver.go @@ -23,8 +23,8 @@ import ( "flag" "time" - log "github.com/golang/glog" "vitess.io/vitess/go/timer" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/dbconfigs" "vitess.io/vitess/go/vt/mysqlproxy" diff --git a/go/vt/vttablet/customrule/filecustomrule/filecustomrule.go b/go/vt/vttablet/customrule/filecustomrule/filecustomrule.go index 142da0842b0..f19e5bcfb2d 100644 --- a/go/vt/vttablet/customrule/filecustomrule/filecustomrule.go +++ b/go/vt/vttablet/customrule/filecustomrule/filecustomrule.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "time" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/vttablet/tabletserver" "vitess.io/vitess/go/vt/vttablet/tabletserver/rules" ) diff --git a/go/vt/vttablet/customrule/topocustomrule/topocustomrule.go b/go/vt/vttablet/customrule/topocustomrule/topocustomrule.go index 405fc2ad61d..47ab990076a 100644 --- a/go/vt/vttablet/customrule/topocustomrule/topocustomrule.go +++ b/go/vt/vttablet/customrule/topocustomrule/topocustomrule.go @@ -28,8 +28,7 @@ import ( "sync" "time" - log "github.com/golang/glog" - + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/vttablet/tabletserver" diff --git a/go/vt/vttablet/endtoend/endtoend.go b/go/vt/vttablet/endtoend/endtoend.go index 61962316952..e259d286406 100644 --- a/go/vt/vttablet/endtoend/endtoend.go +++ b/go/vt/vttablet/endtoend/endtoend.go @@ -22,8 +22,8 @@ import ( "encoding/json" "fmt" - log "github.com/golang/glog" "vitess.io/vitess/go/sqltypes" + "vitess.io/vitess/go/vt/log" ) func prettyPrint(qr sqltypes.Result) string { diff --git a/go/vt/vttablet/filelogger/filelogger.go b/go/vt/vttablet/filelogger/filelogger.go index 67846075d90..19421486136 100644 --- a/go/vt/vttablet/filelogger/filelogger.go +++ b/go/vt/vttablet/filelogger/filelogger.go @@ -20,8 +20,8 @@ package filelogger import ( "flag" - log "github.com/golang/glog" "vitess.io/vitess/go/streamlog" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv" ) diff --git a/go/vt/vttablet/heartbeat/reader.go b/go/vt/vttablet/heartbeat/reader.go index 7affbb80ba1..07852e51df2 100644 --- a/go/vt/vttablet/heartbeat/reader.go +++ b/go/vt/vttablet/heartbeat/reader.go @@ -21,7 +21,6 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/hack" @@ -29,6 +28,7 @@ import ( "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/timer" "vitess.io/vitess/go/vt/dbconfigs" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vttablet/tabletserver/connpool" diff --git a/go/vt/vttablet/heartbeat/writer.go b/go/vt/vttablet/heartbeat/writer.go index b909d4a2625..9325832b901 100644 --- a/go/vt/vttablet/heartbeat/writer.go +++ b/go/vt/vttablet/heartbeat/writer.go @@ -21,7 +21,6 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/hack" @@ -32,6 +31,7 @@ import ( "vitess.io/vitess/go/timer" "vitess.io/vitess/go/vt/dbconfigs" "vitess.io/vitess/go/vt/dbconnpool" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vttablet/tabletserver/connpool" diff --git a/go/vt/vttablet/sysloglogger/sysloglogger.go b/go/vt/vttablet/sysloglogger/sysloglogger.go index 125b160efed..60f2f97d4d7 100644 --- a/go/vt/vttablet/sysloglogger/sysloglogger.go +++ b/go/vt/vttablet/sysloglogger/sysloglogger.go @@ -21,7 +21,7 @@ import ( "flag" "log/syslog" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv" ) diff --git a/go/vt/vttablet/tabletconn/tablet_conn.go b/go/vt/vttablet/tabletconn/tablet_conn.go index e0842c4f89e..20fa7081427 100644 --- a/go/vt/vttablet/tabletconn/tablet_conn.go +++ b/go/vt/vttablet/tabletconn/tablet_conn.go @@ -19,9 +19,8 @@ package tabletconn import ( "flag" - log "github.com/golang/glog" - "vitess.io/vitess/go/vt/grpcclient" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/vterrors" "vitess.io/vitess/go/vt/vttablet/queryservice" diff --git a/go/vt/vttablet/tabletmanager/action_agent.go b/go/vt/vttablet/tabletmanager/action_agent.go index 7067875b72a..3968883f526 100644 --- a/go/vt/vttablet/tabletmanager/action_agent.go +++ b/go/vt/vttablet/tabletmanager/action_agent.go @@ -44,7 +44,6 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "github.com/golang/protobuf/proto" @@ -56,6 +55,7 @@ import ( "vitess.io/vitess/go/vt/dbconfigs" "vitess.io/vitess/go/vt/health" "vitess.io/vitess/go/vt/key" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/mysqlctl" "vitess.io/vitess/go/vt/servenv" diff --git a/go/vt/vttablet/tabletmanager/binlog_players.go b/go/vt/vttablet/tabletmanager/binlog_players.go index 338020cd084..032220cc300 100644 --- a/go/vt/vttablet/tabletmanager/binlog_players.go +++ b/go/vt/vttablet/tabletmanager/binlog_players.go @@ -29,7 +29,6 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" @@ -39,6 +38,7 @@ import ( "vitess.io/vitess/go/vt/concurrency" "vitess.io/vitess/go/vt/discovery" "vitess.io/vitess/go/vt/key" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/mysqlctl" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/topo/topoproto" diff --git a/go/vt/vttablet/tabletmanager/healthcheck.go b/go/vt/vttablet/tabletmanager/healthcheck.go index ab3f0447850..77606b999eb 100644 --- a/go/vt/vttablet/tabletmanager/healthcheck.go +++ b/go/vt/vttablet/tabletmanager/healthcheck.go @@ -33,10 +33,10 @@ import ( "html/template" "time" - log "github.com/golang/glog" "github.com/golang/protobuf/proto" "vitess.io/vitess/go/timer" "vitess.io/vitess/go/vt/health" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/topo" diff --git a/go/vt/vttablet/tabletmanager/init_tablet.go b/go/vt/vttablet/tabletmanager/init_tablet.go index 7d2a6389f7f..5e60117f6a2 100644 --- a/go/vt/vttablet/tabletmanager/init_tablet.go +++ b/go/vt/vttablet/tabletmanager/init_tablet.go @@ -24,10 +24,10 @@ import ( "fmt" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/flagutil" "vitess.io/vitess/go/netutil" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/topo/topoproto" diff --git a/go/vt/vttablet/tabletmanager/initial_rebuild.go b/go/vt/vttablet/tabletmanager/initial_rebuild.go index 534d7cb938e..b89a32d9acd 100644 --- a/go/vt/vttablet/tabletmanager/initial_rebuild.go +++ b/go/vt/vttablet/tabletmanager/initial_rebuild.go @@ -17,8 +17,7 @@ limitations under the License. package tabletmanager import ( - log "github.com/golang/glog" - + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/topotools" diff --git a/go/vt/vttablet/tabletmanager/orchestrator.go b/go/vt/vttablet/tabletmanager/orchestrator.go index 8be7d8565d8..3d9a8a04910 100644 --- a/go/vt/vttablet/tabletmanager/orchestrator.go +++ b/go/vt/vttablet/tabletmanager/orchestrator.go @@ -26,9 +26,8 @@ import ( "strconv" "time" - log "github.com/golang/glog" - "vitess.io/vitess/go/timer" + "vitess.io/vitess/go/vt/log" topodatapb "vitess.io/vitess/go/vt/proto/topodata" "vitess.io/vitess/go/vt/topo/topoproto" ) diff --git a/go/vt/vttablet/tabletmanager/replication_reporter.go b/go/vt/vttablet/tabletmanager/replication_reporter.go index ab25236bba4..753507c9c89 100644 --- a/go/vt/vttablet/tabletmanager/replication_reporter.go +++ b/go/vt/vttablet/tabletmanager/replication_reporter.go @@ -22,11 +22,11 @@ import ( "html/template" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/vt/health" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/mysqlctl" ) diff --git a/go/vt/vttablet/tabletmanager/restore.go b/go/vt/vttablet/tabletmanager/restore.go index a8d28d24a1a..6196bcf5f0c 100644 --- a/go/vt/vttablet/tabletmanager/restore.go +++ b/go/vt/vttablet/tabletmanager/restore.go @@ -20,8 +20,8 @@ import ( "flag" "fmt" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/vt/logutil" diff --git a/go/vt/vttablet/tabletmanager/rpc_actions.go b/go/vt/vttablet/tabletmanager/rpc_actions.go index b6ceabffcc3..2ac5da8548a 100644 --- a/go/vt/vttablet/tabletmanager/rpc_actions.go +++ b/go/vt/vttablet/tabletmanager/rpc_actions.go @@ -21,10 +21,10 @@ import ( "regexp" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/vt/hook" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/mysqlctl" "vitess.io/vitess/go/vt/topotools" diff --git a/go/vt/vttablet/tabletmanager/rpc_external_reparent.go b/go/vt/vttablet/tabletmanager/rpc_external_reparent.go index d54ad131b9b..0a5d974987d 100644 --- a/go/vt/vttablet/tabletmanager/rpc_external_reparent.go +++ b/go/vt/vttablet/tabletmanager/rpc_external_reparent.go @@ -21,13 +21,13 @@ import ( "sync" "time" - log "github.com/golang/glog" "github.com/golang/protobuf/proto" "golang.org/x/net/context" "vitess.io/vitess/go/event" "vitess.io/vitess/go/stats" "vitess.io/vitess/go/trace" "vitess.io/vitess/go/vt/concurrency" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/topo/topoproto" "vitess.io/vitess/go/vt/topotools/events" diff --git a/go/vt/vttablet/tabletmanager/rpc_replication.go b/go/vt/vttablet/tabletmanager/rpc_replication.go index 0dccfe51791..3aa8c010694 100644 --- a/go/vt/vttablet/tabletmanager/rpc_replication.go +++ b/go/vt/vttablet/tabletmanager/rpc_replication.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/mysqlctl" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/topo/topoproto" diff --git a/go/vt/vttablet/tabletmanager/rpc_schema.go b/go/vt/vttablet/tabletmanager/rpc_schema.go index b951e3c52ac..0c760cbb423 100644 --- a/go/vt/vttablet/tabletmanager/rpc_schema.go +++ b/go/vt/vttablet/tabletmanager/rpc_schema.go @@ -19,10 +19,10 @@ package tabletmanager import ( "fmt" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/mysqlctl/tmutils" "vitess.io/vitess/go/vt/topo/topoproto" diff --git a/go/vt/vttablet/tabletmanager/rpc_server.go b/go/vt/vttablet/tabletmanager/rpc_server.go index ac89e1d143d..555faa0e1c6 100644 --- a/go/vt/vttablet/tabletmanager/rpc_server.go +++ b/go/vt/vttablet/tabletmanager/rpc_server.go @@ -19,10 +19,10 @@ package tabletmanager import ( "fmt" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/tb" "vitess.io/vitess/go/vt/callinfo" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo/topoproto" ) diff --git a/go/vt/vttablet/tabletmanager/state_change.go b/go/vt/vttablet/tabletmanager/state_change.go index 181e01fa8e0..92e0e70253a 100644 --- a/go/vt/vttablet/tabletmanager/state_change.go +++ b/go/vt/vttablet/tabletmanager/state_change.go @@ -26,9 +26,9 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" "vitess.io/vitess/go/event" "vitess.io/vitess/go/trace" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/mysqlctl" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/topo/topoproto" diff --git a/go/vt/vttablet/tabletserver/connpool/dbconn.go b/go/vt/vttablet/tabletserver/connpool/dbconn.go index f0b44a19c18..e36b0fce386 100644 --- a/go/vt/vttablet/tabletserver/connpool/dbconn.go +++ b/go/vt/vttablet/tabletserver/connpool/dbconn.go @@ -22,7 +22,6 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" @@ -30,6 +29,7 @@ import ( "vitess.io/vitess/go/sync2" "vitess.io/vitess/go/trace" "vitess.io/vitess/go/vt/dbconnpool" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv" querypb "vitess.io/vitess/go/vt/proto/query" diff --git a/go/vt/vttablet/tabletserver/messager/engine.go b/go/vt/vttablet/tabletserver/messager/engine.go index 563d473c7e5..8d8741262ce 100644 --- a/go/vt/vttablet/tabletserver/messager/engine.go +++ b/go/vt/vttablet/tabletserver/messager/engine.go @@ -21,12 +21,12 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/sync2" "vitess.io/vitess/go/vt/dbconfigs" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vterrors" "vitess.io/vitess/go/vt/vttablet/tabletserver/connpool" diff --git a/go/vt/vttablet/tabletserver/messager/message_manager.go b/go/vt/vttablet/tabletserver/messager/message_manager.go index a0cce941691..72d35512e9e 100644 --- a/go/vt/vttablet/tabletserver/messager/message_manager.go +++ b/go/vt/vttablet/tabletserver/messager/message_manager.go @@ -21,13 +21,13 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/stats" "vitess.io/vitess/go/sync2" "vitess.io/vitess/go/timer" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vttablet/tabletserver/connpool" "vitess.io/vitess/go/vt/vttablet/tabletserver/schema" diff --git a/go/vt/vttablet/tabletserver/planbuilder/dml.go b/go/vt/vttablet/tabletserver/planbuilder/dml.go index c59c5c9df6c..c851bde6401 100644 --- a/go/vt/vttablet/tabletserver/planbuilder/dml.go +++ b/go/vt/vttablet/tabletserver/planbuilder/dml.go @@ -17,9 +17,8 @@ limitations under the License. package planbuilder import ( - log "github.com/golang/glog" - "vitess.io/vitess/go/sqltypes" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vterrors" "vitess.io/vitess/go/vt/vttablet/tabletserver/schema" diff --git a/go/vt/vttablet/tabletserver/query_engine.go b/go/vt/vttablet/tabletserver/query_engine.go index 447914fed46..1d380099709 100644 --- a/go/vt/vttablet/tabletserver/query_engine.go +++ b/go/vt/vttablet/tabletserver/query_engine.go @@ -24,7 +24,6 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/acl" @@ -36,6 +35,7 @@ import ( "vitess.io/vitess/go/trace" "vitess.io/vitess/go/vt/dbconfigs" "vitess.io/vitess/go/vt/dbconnpool" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/tableacl" diff --git a/go/vt/vttablet/tabletserver/query_executor.go b/go/vt/vttablet/tabletserver/query_executor.go index 60d1e1f5699..0576c21ed78 100644 --- a/go/vt/vttablet/tabletserver/query_executor.go +++ b/go/vt/vttablet/tabletserver/query_executor.go @@ -23,7 +23,6 @@ import ( "strings" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/hack" @@ -32,6 +31,7 @@ import ( "vitess.io/vitess/go/trace" "vitess.io/vitess/go/vt/callerid" "vitess.io/vitess/go/vt/callinfo" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/tableacl" "vitess.io/vitess/go/vt/vterrors" diff --git a/go/vt/vttablet/tabletserver/querylogz.go b/go/vt/vttablet/tabletserver/querylogz.go index 41727eb7f80..7eab0b7fe16 100644 --- a/go/vt/vttablet/tabletserver/querylogz.go +++ b/go/vt/vttablet/tabletserver/querylogz.go @@ -25,8 +25,8 @@ import ( "text/template" "time" - log "github.com/golang/glog" "vitess.io/vitess/go/acl" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logz" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv" diff --git a/go/vt/vttablet/tabletserver/queryz.go b/go/vt/vttablet/tabletserver/queryz.go index 3a51e6768d9..21b5c482e25 100644 --- a/go/vt/vttablet/tabletserver/queryz.go +++ b/go/vt/vttablet/tabletserver/queryz.go @@ -23,8 +23,8 @@ import ( "sort" "time" - log "github.com/golang/glog" "vitess.io/vitess/go/acl" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logz" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vttablet/tabletserver/planbuilder" diff --git a/go/vt/vttablet/tabletserver/replication_watcher.go b/go/vt/vttablet/tabletserver/replication_watcher.go index 5e78af72e6e..98b43ca1d42 100644 --- a/go/vt/vttablet/tabletserver/replication_watcher.go +++ b/go/vt/vttablet/tabletserver/replication_watcher.go @@ -20,7 +20,6 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" @@ -28,6 +27,7 @@ import ( "vitess.io/vitess/go/vt/binlog" "vitess.io/vitess/go/vt/binlog/eventtoken" "vitess.io/vitess/go/vt/dbconfigs" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/vttablet/tabletserver/schema" "vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv" diff --git a/go/vt/vttablet/tabletserver/rules/map.go b/go/vt/vttablet/tabletserver/rules/map.go index b098a5ebd06..8159507c5fb 100644 --- a/go/vt/vttablet/tabletserver/rules/map.go +++ b/go/vt/vttablet/tabletserver/rules/map.go @@ -21,7 +21,7 @@ import ( "errors" "sync" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/vttablet/tabletserver/planbuilder" ) diff --git a/go/vt/vttablet/tabletserver/schema/engine.go b/go/vt/vttablet/tabletserver/schema/engine.go index 8007ae11229..dfa4a6ff022 100644 --- a/go/vt/vttablet/tabletserver/schema/engine.go +++ b/go/vt/vttablet/tabletserver/schema/engine.go @@ -24,7 +24,6 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/acl" @@ -34,6 +33,7 @@ import ( "vitess.io/vitess/go/timer" "vitess.io/vitess/go/vt/concurrency" "vitess.io/vitess/go/vt/dbconfigs" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vterrors" "vitess.io/vitess/go/vt/vttablet/tabletserver/connpool" diff --git a/go/vt/vttablet/tabletserver/schema/load_table.go b/go/vt/vttablet/tabletserver/schema/load_table.go index 87fdc919f25..95d8a739c1c 100644 --- a/go/vt/vttablet/tabletserver/schema/load_table.go +++ b/go/vt/vttablet/tabletserver/schema/load_table.go @@ -22,9 +22,8 @@ import ( "strings" "time" - log "github.com/golang/glog" - "vitess.io/vitess/go/sqltypes" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vttablet/tabletserver/connpool" "vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv" diff --git a/go/vt/vttablet/tabletserver/schema/schemaz.go b/go/vt/vttablet/tabletserver/schema/schemaz.go index 527ff9804c8..5356fa16c64 100644 --- a/go/vt/vttablet/tabletserver/schema/schemaz.go +++ b/go/vt/vttablet/tabletserver/schema/schemaz.go @@ -21,8 +21,8 @@ import ( "net/http" "sort" - log "github.com/golang/glog" "vitess.io/vitess/go/acl" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logz" ) diff --git a/go/vt/vttablet/tabletserver/splitquery/equal_splits_algorithm.go b/go/vt/vttablet/tabletserver/splitquery/equal_splits_algorithm.go index 95e0b6b8f9e..d543b49a6be 100644 --- a/go/vt/vttablet/tabletserver/splitquery/equal_splits_algorithm.go +++ b/go/vt/vttablet/tabletserver/splitquery/equal_splits_algorithm.go @@ -21,9 +21,8 @@ import ( "math/big" "strconv" - log "github.com/golang/glog" - "vitess.io/vitess/go/sqltypes" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vterrors" "vitess.io/vitess/go/vt/vttablet/tabletserver/schema" diff --git a/go/vt/vttablet/tabletserver/stream_queryz.go b/go/vt/vttablet/tabletserver/stream_queryz.go index 941151b1882..79449817f03 100644 --- a/go/vt/vttablet/tabletserver/stream_queryz.go +++ b/go/vt/vttablet/tabletserver/stream_queryz.go @@ -23,8 +23,8 @@ import ( "strconv" "text/template" - log "github.com/golang/glog" "vitess.io/vitess/go/acl" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logz" ) diff --git a/go/vt/vttablet/tabletserver/tabletenv/config.go b/go/vt/vttablet/tabletserver/tabletenv/config.go index ad2086ab6b6..6cc91f25e16 100644 --- a/go/vt/vttablet/tabletserver/tabletenv/config.go +++ b/go/vt/vttablet/tabletserver/tabletenv/config.go @@ -22,12 +22,11 @@ import ( "fmt" "time" - log "github.com/golang/glog" - "github.com/golang/protobuf/proto" "vitess.io/vitess/go/flagutil" "vitess.io/vitess/go/streamlog" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/throttler" ) diff --git a/go/vt/vttablet/tabletserver/tabletenv/tabletenv.go b/go/vt/vttablet/tabletserver/tabletenv/tabletenv.go index 0dc5986c266..619ca1407ad 100644 --- a/go/vt/vttablet/tabletserver/tabletenv/tabletenv.go +++ b/go/vt/vttablet/tabletserver/tabletenv/tabletenv.go @@ -21,12 +21,12 @@ package tabletenv import ( "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/stats" "vitess.io/vitess/go/tb" "vitess.io/vitess/go/vt/callerid" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc" diff --git a/go/vt/vttablet/tabletserver/tabletserver.go b/go/vt/vttablet/tabletserver/tabletserver.go index a53dfae91b1..b84b975391a 100644 --- a/go/vt/vttablet/tabletserver/tabletserver.go +++ b/go/vt/vttablet/tabletserver/tabletserver.go @@ -25,7 +25,6 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/acl" @@ -40,6 +39,7 @@ import ( "vitess.io/vitess/go/vt/callerid" "vitess.io/vitess/go/vt/dbconfigs" "vitess.io/vitess/go/vt/dbconnpool" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/topo" diff --git a/go/vt/vttablet/tabletserver/tabletserver_test.go b/go/vt/vttablet/tabletserver/tabletserver_test.go index 6e8bb901a28..7f749a654d5 100644 --- a/go/vt/vttablet/tabletserver/tabletserver_test.go +++ b/go/vt/vttablet/tabletserver/tabletserver_test.go @@ -28,13 +28,13 @@ import ( "testing" "time" - log "github.com/golang/glog" "github.com/golang/protobuf/proto" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/mysql/fakesqldb" "vitess.io/vitess/go/sqltypes" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vterrors" "vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv" diff --git a/go/vt/vttablet/tabletserver/twopc.go b/go/vt/vttablet/tabletserver/twopc.go index b6c4c539706..e71dbacd7e7 100644 --- a/go/vt/vttablet/tabletserver/twopc.go +++ b/go/vt/vttablet/tabletserver/twopc.go @@ -20,7 +20,6 @@ import ( "fmt" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/hack" @@ -30,6 +29,7 @@ import ( "vitess.io/vitess/go/stats" "vitess.io/vitess/go/vt/dbconfigs" "vitess.io/vitess/go/vt/dbconnpool" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/sqlparser" "vitess.io/vitess/go/vt/vterrors" "vitess.io/vitess/go/vt/vttablet/tabletserver/connpool" diff --git a/go/vt/vttablet/tabletserver/twopcz.go b/go/vt/vttablet/tabletserver/twopcz.go index c9f4398d38d..d5cc8ff7776 100644 --- a/go/vt/vttablet/tabletserver/twopcz.go +++ b/go/vt/vttablet/tabletserver/twopcz.go @@ -22,9 +22,8 @@ import ( "html/template" "net/http" - log "github.com/golang/glog" - "vitess.io/vitess/go/acl" + "vitess.io/vitess/go/vt/log" ) var ( diff --git a/go/vt/vttablet/tabletserver/tx_engine.go b/go/vt/vttablet/tabletserver/tx_engine.go index ee151fd4012..87d10453843 100644 --- a/go/vt/vttablet/tabletserver/tx_engine.go +++ b/go/vt/vttablet/tabletserver/tx_engine.go @@ -20,13 +20,13 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/timer" "vitess.io/vitess/go/vt/concurrency" "vitess.io/vitess/go/vt/dbconfigs" "vitess.io/vitess/go/vt/dtids" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/vtgate/vtgateconn" "vitess.io/vitess/go/vt/vttablet/tabletserver/connpool" "vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv" diff --git a/go/vt/vttablet/tabletserver/tx_executor.go b/go/vt/vttablet/tabletserver/tx_executor.go index 338a30d54b9..f9d00174c40 100644 --- a/go/vt/vttablet/tabletserver/tx_executor.go +++ b/go/vt/vttablet/tabletserver/tx_executor.go @@ -21,8 +21,8 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" "vitess.io/vitess/go/trace" + "vitess.io/vitess/go/vt/log" querypb "vitess.io/vitess/go/vt/proto/query" vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc" diff --git a/go/vt/vttablet/tabletserver/tx_pool.go b/go/vt/vttablet/tabletserver/tx_pool.go index 85aaa965fa7..efe44551e6f 100644 --- a/go/vt/vttablet/tabletserver/tx_pool.go +++ b/go/vt/vttablet/tabletserver/tx_pool.go @@ -23,7 +23,6 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/mysql" @@ -33,6 +32,7 @@ import ( "vitess.io/vitess/go/sync2" "vitess.io/vitess/go/timer" "vitess.io/vitess/go/vt/callerid" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/vterrors" "vitess.io/vitess/go/vt/vttablet/tabletserver/connpool" "vitess.io/vitess/go/vt/vttablet/tabletserver/messager" diff --git a/go/vt/vttablet/tabletserver/txlimiter/tx_limiter.go b/go/vt/vttablet/tabletserver/txlimiter/tx_limiter.go index acc4e97b8d4..da889015b5d 100644 --- a/go/vt/vttablet/tabletserver/txlimiter/tx_limiter.go +++ b/go/vt/vttablet/tabletserver/txlimiter/tx_limiter.go @@ -20,10 +20,9 @@ import ( "strings" "sync" - log "github.com/golang/glog" - "vitess.io/vitess/go/stats" "vitess.io/vitess/go/vt/callerid" + "vitess.io/vitess/go/vt/log" querypb "vitess.io/vitess/go/vt/proto/query" vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc" diff --git a/go/vt/vttablet/tabletserver/txlogz.go b/go/vt/vttablet/tabletserver/txlogz.go index db8fcfece3f..25e2097865c 100644 --- a/go/vt/vttablet/tabletserver/txlogz.go +++ b/go/vt/vttablet/tabletserver/txlogz.go @@ -23,10 +23,10 @@ import ( "net/http" "time" - log "github.com/golang/glog" "vitess.io/vitess/go/acl" "vitess.io/vitess/go/streamlog" "vitess.io/vitess/go/vt/callerid" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logz" "vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv" diff --git a/go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go b/go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go index 0d63510dbc3..40dd699b087 100644 --- a/go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go +++ b/go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go @@ -21,11 +21,10 @@ import ( "sync" "time" - log "github.com/golang/glog" - "github.com/golang/protobuf/proto" "vitess.io/vitess/go/vt/discovery" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/throttler" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv" diff --git a/go/vt/vttablet/tmclient/rpc_client_api.go b/go/vt/vttablet/tmclient/rpc_client_api.go index a49e9e7ce63..628d3e0987d 100644 --- a/go/vt/vttablet/tmclient/rpc_client_api.go +++ b/go/vt/vttablet/tmclient/rpc_client_api.go @@ -20,9 +20,9 @@ import ( "flag" "time" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/vt/hook" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/mysqlctl/tmutils" diff --git a/go/vt/vttest/local_cluster.go b/go/vt/vttest/local_cluster.go index 6764f0520fa..fd4e308cbab 100644 --- a/go/vt/vttest/local_cluster.go +++ b/go/vt/vttest/local_cluster.go @@ -30,10 +30,9 @@ import ( "strings" "unicode" - log "github.com/golang/glog" - "vitess.io/vitess/go/mysql" "vitess.io/vitess/go/sqltypes" + "vitess.io/vitess/go/vt/log" vschemapb "vitess.io/vitess/go/vt/proto/vschema" vttestpb "vitess.io/vitess/go/vt/proto/vttest" diff --git a/go/vt/vttime/clock.go b/go/vt/vttime/clock.go index 44799563dbc..6347d0e8165 100644 --- a/go/vt/vttime/clock.go +++ b/go/vt/vttime/clock.go @@ -19,7 +19,7 @@ package vttime import ( "flag" - log "github.com/golang/glog" + "vitess.io/vitess/go/vt/log" ) var ( diff --git a/go/vt/worker/command.go b/go/vt/worker/command.go index d9cdc0743da..fe8ce427754 100644 --- a/go/vt/worker/command.go +++ b/go/vt/worker/command.go @@ -27,8 +27,7 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" - + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/vterrors" "vitess.io/vitess/go/vt/wrangler" diff --git a/go/vt/worker/instance.go b/go/vt/worker/instance.go index 2bbbc136823..f730cde5629 100644 --- a/go/vt/worker/instance.go +++ b/go/vt/worker/instance.go @@ -27,9 +27,8 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" - "vitess.io/vitess/go/tb" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc" "vitess.io/vitess/go/vt/topo" diff --git a/go/vt/worker/interactive.go b/go/vt/worker/interactive.go index f318ae52385..4ac62976e01 100644 --- a/go/vt/worker/interactive.go +++ b/go/vt/worker/interactive.go @@ -23,9 +23,8 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" - "vitess.io/vitess/go/acl" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/servenv" ) diff --git a/go/vt/worker/restartable_result_reader.go b/go/vt/worker/restartable_result_reader.go index 69f039f272c..cc4452db699 100644 --- a/go/vt/worker/restartable_result_reader.go +++ b/go/vt/worker/restartable_result_reader.go @@ -25,11 +25,10 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" - "vitess.io/vitess/go/sqlescape" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/vt/grpcclient" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/topo/topoproto" "vitess.io/vitess/go/vt/vttablet/queryservice" diff --git a/go/vt/worker/topo_utils.go b/go/vt/worker/topo_utils.go index d14cfaff72f..02b1f32aa95 100644 --- a/go/vt/worker/topo_utils.go +++ b/go/vt/worker/topo_utils.go @@ -22,10 +22,9 @@ import ( "math/rand" "time" - log "github.com/golang/glog" - "golang.org/x/net/context" "vitess.io/vitess/go/vt/discovery" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/servenv" "vitess.io/vitess/go/vt/topo/topoproto" "vitess.io/vitess/go/vt/wrangler" diff --git a/go/vt/worker/vtworkerclient/interface.go b/go/vt/worker/vtworkerclient/interface.go index dff81ebda12..3eca9edaa79 100644 --- a/go/vt/worker/vtworkerclient/interface.go +++ b/go/vt/worker/vtworkerclient/interface.go @@ -21,8 +21,8 @@ import ( "flag" "fmt" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" ) diff --git a/go/vt/workflow/long_polling.go b/go/vt/workflow/long_polling.go index a37a70981f4..ce5fca33e01 100644 --- a/go/vt/workflow/long_polling.go +++ b/go/vt/workflow/long_polling.go @@ -29,9 +29,9 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" "vitess.io/vitess/go/acl" "vitess.io/vitess/go/timer" + "vitess.io/vitess/go/vt/log" ) const ( diff --git a/go/vt/workflow/manager.go b/go/vt/workflow/manager.go index bac50ff0cc1..366de4cd3b9 100644 --- a/go/vt/workflow/manager.go +++ b/go/vt/workflow/manager.go @@ -23,10 +23,10 @@ import ( "sync" "time" - log "github.com/golang/glog" gouuid "github.com/pborman/uuid" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo" workflowpb "vitess.io/vitess/go/vt/proto/workflow" diff --git a/go/vt/workflow/node.go b/go/vt/workflow/node.go index d72f29feab1..26519ff733b 100644 --- a/go/vt/workflow/node.go +++ b/go/vt/workflow/node.go @@ -24,9 +24,9 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" workflowpb "vitess.io/vitess/go/vt/proto/workflow" ) diff --git a/go/vt/workflow/resharding/horizontal_resharding_workflow.go b/go/vt/workflow/resharding/horizontal_resharding_workflow.go index b2c105a7d7c..86fd2446aa2 100644 --- a/go/vt/workflow/resharding/horizontal_resharding_workflow.go +++ b/go/vt/workflow/resharding/horizontal_resharding_workflow.go @@ -26,10 +26,10 @@ import ( "strconv" "strings" - log "github.com/golang/glog" "github.com/golang/protobuf/proto" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/vttablet/tmclient" diff --git a/go/vt/workflow/resharding/parallel_runner.go b/go/vt/workflow/resharding/parallel_runner.go index e40f90099a9..3391ceff515 100644 --- a/go/vt/workflow/resharding/parallel_runner.go +++ b/go/vt/workflow/resharding/parallel_runner.go @@ -22,9 +22,9 @@ import ( "strings" "sync" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/workflow" diff --git a/go/vt/workflow/resharding/test_workflow_test.go b/go/vt/workflow/resharding/test_workflow_test.go index 63c7eb4a71f..d3049227442 100644 --- a/go/vt/workflow/resharding/test_workflow_test.go +++ b/go/vt/workflow/resharding/test_workflow_test.go @@ -23,10 +23,10 @@ import ( "strconv" "sync" - log "github.com/golang/glog" "golang.org/x/net/context" "github.com/golang/protobuf/proto" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/workflow" diff --git a/go/vt/workflow/sleep_workflow.go b/go/vt/workflow/sleep_workflow.go index 7ffdcac93c1..b4b4f9f56ac 100644 --- a/go/vt/workflow/sleep_workflow.go +++ b/go/vt/workflow/sleep_workflow.go @@ -23,9 +23,9 @@ import ( "sync" "time" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/topo" diff --git a/go/vt/workflow/topovalidator/validator.go b/go/vt/workflow/topovalidator/validator.go index e31011114ff..1564e539282 100644 --- a/go/vt/workflow/topovalidator/validator.go +++ b/go/vt/workflow/topovalidator/validator.go @@ -28,8 +28,8 @@ import ( "fmt" "sync" - log "github.com/golang/glog" "golang.org/x/net/context" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/logutil" "vitess.io/vitess/go/vt/topo" diff --git a/go/vt/workflow/websocket.go b/go/vt/workflow/websocket.go index ab13de3c6a2..49ab4c9d4cf 100644 --- a/go/vt/workflow/websocket.go +++ b/go/vt/workflow/websocket.go @@ -21,11 +21,11 @@ import ( "fmt" "net/http" - log "github.com/golang/glog" "github.com/gorilla/websocket" "golang.org/x/net/context" "vitess.io/vitess/go/acl" + "vitess.io/vitess/go/vt/log" ) var upgrader = websocket.Upgrader{} // use default options diff --git a/go/vt/wrangler/permissions.go b/go/vt/wrangler/permissions.go index 6b99574962a..8cf49fceaad 100644 --- a/go/vt/wrangler/permissions.go +++ b/go/vt/wrangler/permissions.go @@ -21,9 +21,9 @@ import ( "sort" "sync" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/vt/concurrency" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/mysqlctl/tmutils" "vitess.io/vitess/go/vt/topo/topoproto" diff --git a/go/vt/wrangler/schema.go b/go/vt/wrangler/schema.go index f70c074c7ed..84ffc2ef94e 100644 --- a/go/vt/wrangler/schema.go +++ b/go/vt/wrangler/schema.go @@ -26,10 +26,10 @@ import ( "golang.org/x/net/context" - log "github.com/golang/glog" "vitess.io/vitess/go/sqltypes" "vitess.io/vitess/go/sync2" "vitess.io/vitess/go/vt/concurrency" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/mysqlctl/tmutils" "vitess.io/vitess/go/vt/topo" "vitess.io/vitess/go/vt/topo/topoproto" diff --git a/go/vt/wrangler/version.go b/go/vt/wrangler/version.go index 8231eb10689..62298579ca3 100644 --- a/go/vt/wrangler/version.go +++ b/go/vt/wrangler/version.go @@ -24,9 +24,9 @@ import ( "sort" "sync" - log "github.com/golang/glog" "golang.org/x/net/context" "vitess.io/vitess/go/vt/concurrency" + "vitess.io/vitess/go/vt/log" "vitess.io/vitess/go/vt/topo/topoproto" topodatapb "vitess.io/vitess/go/vt/proto/topodata" diff --git a/go/vt/zkctl/zkconf.go b/go/vt/zkctl/zkconf.go index 15657c10494..360094e684d 100644 --- a/go/vt/zkctl/zkconf.go +++ b/go/vt/zkctl/zkconf.go @@ -29,10 +29,9 @@ import ( "strings" "text/template" - log "github.com/golang/glog" - "vitess.io/vitess/go/netutil" "vitess.io/vitess/go/vt/env" + "vitess.io/vitess/go/vt/log" ) type zkServerAddr struct { diff --git a/go/vt/zkctl/zkctl.go b/go/vt/zkctl/zkctl.go index 6f38652ded3..4275e32b61e 100644 --- a/go/vt/zkctl/zkctl.go +++ b/go/vt/zkctl/zkctl.go @@ -32,10 +32,10 @@ import ( "syscall" "time" - log "github.com/golang/glog" zookeeper "github.com/samuel/go-zookeeper/zk" "vitess.io/vitess/go/vt/env" + "vitess.io/vitess/go/vt/log" ) const ( diff --git a/go/vt/zkctl/zkctl_local.go b/go/vt/zkctl/zkctl_local.go index 96c1d4f9ef5..0a5c763b7f3 100644 --- a/go/vt/zkctl/zkctl_local.go +++ b/go/vt/zkctl/zkctl_local.go @@ -19,9 +19,8 @@ package zkctl import ( "fmt" - log "github.com/golang/glog" - "vitess.io/vitess/go/netutil" + "vitess.io/vitess/go/vt/log" ) // StartLocalZk is a helper method to create a local ZK process. Used