Skip to content

Factor out glog references #3830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sougou merged 1 commit into from
Apr 20, 2018
Merged

Factor out glog references #3830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go/acl/acl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/mysqlctl/mysqlctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/mysqlctld/mysqlctld.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/query_analyzer/query_analyzer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion go/cmd/topo2topo/topo2topo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/vtclient/vtclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/vtcombo/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/vtcombo/tablet_map.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/vtctl/vtctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/vtctlclient/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion go/cmd/vtctld/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/vtexplain/vtexplain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions go/cmd/vtgate/vtgate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions go/cmd/vtgateclienttest/services/terminal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/vtqueryserver/vtqueryserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/vttablet/vttablet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/vttestserver/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 1 addition & 2 deletions go/cmd/vttlstest/vttlstest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/vtworker/vtworker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/vtworkerclient/vtworkerclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion go/cmd/zk/zkcmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/zkctl/zkctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/zkctld/zkctld.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion go/event/syslogger/syslogger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go/exit/exit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go/mysql/auth_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions go/mysql/auth_server_static.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion go/mysql/ldapauthserver/auth_server_ldap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion go/mysql/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion go/proc/proc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"syscall"
"time"

log "github.com/golang/glog"
"vitess.io/vitess/go/vt/log"
)

const pidURL = "/debug/pid"
Expand Down
2 changes: 1 addition & 1 deletion go/stats/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion go/stats/influxdbbackend/influxdb_backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion go/stats/promstats/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion go/streamlog/streamlog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion go/vt/automation/scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
3 changes: 1 addition & 2 deletions go/vt/automation/vtctlclient_wrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Loading