From ac07b6a997636631026c7cd0be88c2cca3bab682 Mon Sep 17 00:00:00 2001
From: Gregory Eremin <g@erem.in>
Date: Fri, 9 Nov 2018 01:09:25 +0100
Subject: [PATCH] Use dep to maintain dependencies

---
 .gitignore           |  1 +
 Gopkg.lock           | 38 ++++++++++++++++++++++++++++++++++++++
 Gopkg.toml           | 15 +++++++++++++++
 binlog/event_rows.go |  6 ++----
 cmd/main.go          | 13 ++++---------
 5 files changed, 60 insertions(+), 13 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 Gopkg.lock
 create mode 100644 Gopkg.toml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..22d0d82
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+vendor
diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 0000000..d7ccdb1
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,38 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  name = "github.com/google/go-cmp"
+  packages = [
+    "cmp",
+    "cmp/internal/diff",
+    "cmp/internal/function",
+    "cmp/internal/value"
+  ]
+  revision = "3af367b6b30c263d47e8895973edcca9a49cf029"
+  version = "v0.2.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/juju/errors"
+  packages = ["."]
+  revision = "a4583d0a56eac4bdd939e38050d0c69abe0a9b41"
+
+[[projects]]
+  branch = "bocadillo"
+  name = "github.com/localhots/mysql"
+  packages = ["."]
+  revision = "c2889dfb94f790a6007c23ced2fa3a457d7d9ab0"
+
+[[projects]]
+  name = "google.golang.org/appengine"
+  packages = ["cloudsql"]
+  revision = "4a4468ece617fc8205e99368fa2200e9d1fad421"
+  version = "v1.3.0"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "54cc4952aaa2b5e14d9b4cf42c54d933ecff5eb0dd354884dd23c9027630ce82"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 0000000..42cba81
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,15 @@
+[[constraint]]
+  name = "github.com/google/go-cmp"
+  version = "0.2.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/juju/errors"
+
+[[constraint]]
+  branch = "bocadillo"
+  name = "github.com/localhots/mysql"
+
+[prune]
+  go-tests = true
+  unused-packages = true
diff --git a/binlog/event_rows.go b/binlog/event_rows.go
index 6b5be4b..ed720f9 100644
--- a/binlog/event_rows.go
+++ b/binlog/event_rows.go
@@ -1,11 +1,11 @@
 package binlog
 
 import (
+	"fmt"
 	"time"
 
 	"github.com/localhots/bocadillo/mysql"
 	"github.com/localhots/bocadillo/tools"
-	"github.com/localhots/pretty"
 )
 
 // RowsEvent contains a Rows Event.
@@ -233,10 +233,8 @@ func (e *RowsEvent) decodeValue(buf *tools.Buffer, ct mysql.ColumnType, meta uin
 		// Too new
 		fallthrough
 	default:
-		pretty.Printf("UNSUPPORTED Type %d %s %x %x\n", ct, ct.String(), meta, buf.Cur())
+		return fmt.Errorf("unsupported type: %d (%s) %x %x", ct, ct.String(), meta, buf.Cur())
 	}
-
-	return nil
 }
 
 // FIXME: Something is fishy with this whole string decoding. It seems like it
diff --git a/cmd/main.go b/cmd/main.go
index ce51e95..74161c7 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/localhots/bocadillo/reader"
-	"github.com/localhots/gobelt/log"
 )
 
 func main() {
@@ -30,12 +29,12 @@ func main() {
 
 	conn, err := reader.Connect(*dsn, conf)
 	if err != nil {
-		log.Fatalf(ctx, "Failed to establish connection: %v", err)
+		log.Fatalf("Failed to establish connection: %v", err)
 	}
 
 	reader, err := reader.NewReader(conn)
 	if err != nil {
-		log.Fatalf(ctx, "Failed to create reader: %v", err)
+		log.Fatalf( "Failed to create reader: %v", err)
 	}
 
 	off := conf.Offset
@@ -43,14 +42,10 @@ func main() {
 	for {
 		evt, err := reader.ReadEvent()
 		if err != nil {
-			log.Fatalf(ctx, "Failed to read event: %v", err)
+			log.Fatalf("Failed to read event: %v", err)
 		}
 		ts := time.Unix(int64(evt.Header.Timestamp), 0).Format(time.RFC3339)
-		log.Info(ctx, "Event received", log.F{
-			"type":      evt.Header.Type,
-			"timestamp": ts,
-			"offset":    off,
-		})
+		log.Printf("Event received: %s %d, %d\n", evt.Header.Type.String(), ts, off4	})
 		off = evt.Header.NextOffset
 	}
 }