Skip to content

Commit e0c24a2

Browse files
authored
use better log and update vendor (#281)
1 parent 35f5832 commit e0c24a2

File tree

41 files changed

+1918
-788
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1918
-788
lines changed

Gopkg.lock

+14-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

-6
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@
4545
branch = "master"
4646
name = "github.com/siddontang/go-mysql"
4747

48-
[[constraint]]
49-
name = "gopkg.in/birkirb/loggers.v1"
50-
branch = "master"
51-
source = "https://github.com/siddontang/loggers.git"
52-
53-
5448
[prune]
5549
go-tests = true
5650
unused-packages = true

cmd/go-mysql-elasticsearch/main.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"syscall"
99

1010
"github.com/juju/errors"
11+
"github.com/siddontang/go-log/log"
1112
"github.com/siddontang/go-mysql-elasticsearch/river"
12-
"gopkg.in/birkirb/loggers.v1/log"
1313
)
1414

1515
var configFile = flag.String("config", "./etc/river.toml", "go-mysql-elasticsearch config file")
@@ -27,8 +27,7 @@ func main() {
2727
runtime.GOMAXPROCS(runtime.NumCPU())
2828
flag.Parse()
2929

30-
level := log.ParseLevel(*logLevel)
31-
log.SetLevel(level)
30+
log.SetLevelByName(*logLevel)
3231

3332
sc := make(chan os.Signal, 1)
3433
signal.Notify(sc,

river/master.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"github.com/BurntSushi/toml"
1111
"github.com/juju/errors"
12+
"github.com/siddontang/go-log/log"
1213
"github.com/siddontang/go-mysql/mysql"
1314
"github.com/siddontang/go/ioutil2"
14-
"gopkg.in/birkirb/loggers.v1/log"
1515
)
1616

1717
type masterInfo struct {

river/river.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"sync"
99

1010
"github.com/juju/errors"
11+
"github.com/siddontang/go-log/log"
1112
"github.com/siddontang/go-mysql-elasticsearch/elastic"
1213
"github.com/siddontang/go-mysql/canal"
13-
"gopkg.in/birkirb/loggers.v1/log"
1414
)
1515

1616
// ErrRuleNotExist is the error if rule is not defined.

river/status.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"net/http"
88
"net/http/pprof"
99

10+
"github.com/siddontang/go-log/log"
1011
"github.com/siddontang/go/sync2"
11-
"gopkg.in/birkirb/loggers.v1/log"
1212
)
1313

1414
type stat struct {

river/sync.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99
"time"
1010

1111
"github.com/juju/errors"
12+
"github.com/siddontang/go-log/log"
1213
"github.com/siddontang/go-mysql-elasticsearch/elastic"
1314
"github.com/siddontang/go-mysql/canal"
1415
"github.com/siddontang/go-mysql/mysql"
1516
"github.com/siddontang/go-mysql/replication"
1617
"github.com/siddontang/go-mysql/schema"
17-
"gopkg.in/birkirb/loggers.v1/log"
1818
)
1919

2020
const (

vendor/github.com/BurntSushi/toml/COPYING

-14
This file was deleted.

vendor/github.com/BurntSushi/toml/cmd/toml-test-decoder/COPYING

-14
This file was deleted.

vendor/github.com/BurntSushi/toml/cmd/toml-test-encoder/COPYING

-14
This file was deleted.

vendor/github.com/BurntSushi/toml/cmd/tomlv/COPYING

-14
This file was deleted.

vendor/github.com/juju/errors/errortypes.go

+24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)