From 1b7093c714593ac5275bf50298949d42e34b9c03 Mon Sep 17 00:00:00 2001
From: Russell Cohen <russell.r.cohen@gmail.com>
Date: Thu, 22 Dec 2016 10:29:25 -0500
Subject: [PATCH 1/2] Delete old renderer

---
 render/Render.go | 71 ------------------------------------------------
 util/Raw.go      |  3 +-
 2 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 render/Render.go

diff --git a/render/Render.go b/render/Render.go
deleted file mode 100644
index 7f4f672..0000000
--- a/render/Render.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/SumoLogic/sumoshell/render-util"
-	"github.com/jroimartin/gocui"
-	"log"
-)
-
-// Need to determine all the columns in the current data, then render based on that
-
-func makeLayout(state *render.RenderState) layoutFunc {
-	return func(g *gocui.Gui) error {
-		_, maxY := g.Size()
-		viewColumns := render.Columns(*state.Messages)
-		viewNames := render.ColumnNames(viewColumns)
-		var pos = 0
-		for _, key := range viewNames {
-			width := viewColumns[key]
-			if v, err := g.SetView(key, pos, 0, pos+width, maxY); err != nil {
-				if err != gocui.ErrorUnkView {
-					return err
-				}
-				fmt.Fprintln(v, key)
-			}
-			pos += width + 1
-		}
-		update(viewNames, state, g)
-		return nil
-	}
-}
-
-func update(columns []string, state *render.RenderState, g *gocui.Gui) {
-	for _, column := range columns {
-		v, _ := g.View(column)
-		v.Clear()
-		fmt.Fprintln(v, column)
-		for _, row := range *state.Messages {
-			fmt.Fprintln(v, row[column])
-		}
-	}
-
-}
-
-type layoutFunc func(*gocui.Gui) error
-
-func quit(g *gocui.Gui, v *gocui.View) error {
-	return gocui.Quit
-}
-
-func main() {
-	var err error
-	g := gocui.NewGui()
-	if err := g.Init(); err != nil {
-		log.Panicln(err)
-	}
-	defer g.Close()
-
-	renderState := render.NewConnectedRenderState(g.Flush)
-	g.SetLayout(makeLayout(renderState))
-	if err := g.SetKeybinding("", gocui.KeyCtrlC, gocui.ModNone, quit); err != nil {
-		log.Panicln(err)
-	}
-
-	g.MainLoop()
-
-	if err != nil && err != gocui.Quit {
-		log.Panicln(err)
-	}
-
-}
diff --git a/util/Raw.go b/util/Raw.go
index ab1df46..20d2a72 100644
--- a/util/Raw.go
+++ b/util/Raw.go
@@ -51,7 +51,8 @@ func ConnectToReader(operator SumoOperator, reader io.Reader) {
 			err := json.Unmarshal(buf, &rawMsg)
 			buf = []byte{}
 			if err != nil {
-				log.Println("Error parsing json")
+				log.Println("Error parsing json", err)
+				log.Println(string(line))
 			} else {
 				mapMessage, ok := rawMsg.(map[string]interface{})
 				if ok {

From 85709f378654213a6270d12c56ce00bb83b02d7a Mon Sep 17 00:00:00 2001
From: Russell Cohen <russell.r.cohen@gmail.com>
Date: Thu, 22 Dec 2016 10:34:19 -0500
Subject: [PATCH 2/2] Move render-basic to render

---
 .gitignore                         | 1 +
 {render-basic => render}/Render.go | 0
 2 files changed, 1 insertion(+)
 rename {render-basic => render}/Render.go (100%)

diff --git a/.gitignore b/.gitignore
index 3819313..d6c987b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.swp
 *.swo
+.idea
diff --git a/render-basic/Render.go b/render/Render.go
similarity index 100%
rename from render-basic/Render.go
rename to render/Render.go