Merge pull request #3854 from vitessio/revert-3830-factor_out_logs

Revert "Factor out glog references"
vitessio · Apr 20, 2018 · 5805555 · 5805555
2 parents 7baba58 + 246e289
commit 5805555
Show file tree

Hide file tree

Showing 215 changed files with 249 additions and 270 deletions.
diff --git a/go/acl/acl.go b/go/acl/acl.go
@@ -26,7 +26,7 @@ import (
 	"net/http"
 	"sync"
 
-	"vitess.io/vitess/go/vt/log"
+	log "github.com/golang/glog"
 )
 
 // This is a list of predefined roles. Applications are free

diff --git a/go/cmd/mysqlctl/mysqlctl.go b/go/cmd/mysqlctl/mysqlctl.go
@@ -23,14 +23,14 @@ import (
 	"os"
 	"time"
 
+	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/flagutil"
 	"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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -24,14 +24,14 @@ import (
 	"strings"
 	"time"
 
+	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/vt/dbconfigs"
 	"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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -24,9 +24,10 @@ 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
@@ -20,10 +20,11 @@ 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
@@ -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
@@ -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
@@ -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
@@ -21,8 +21,9 @@ 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"net"
 
-	"vitess.io/vitess/go/vt/log"
+	log "github.com/golang/glog"
 )
 
 // 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
@@ -27,7 +27,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	"vitess.io/vitess/go/vt/log"
+	log "github.com/golang/glog"
+
 	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
@@ -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
@@ -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
@@ -30,7 +30,7 @@ import (
 	"syscall"
 	"time"
 
-	"vitess.io/vitess/go/vt/log"
+	log "github.com/golang/glog"
 )
 
 const pidURL = "/debug/pid"

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -21,8 +21,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"
 	"vitess.io/vitess/go/vt/vtctl/vtctlclient"