From 03335b0cce08af9a69fccf34cc91b600dc947b63 Mon Sep 17 00:00:00 2001
From: Harish JP <hjp@cloudera.com>
Date: Sun, 16 Jan 2022 14:28:15 -0800
Subject: [PATCH] * Migrate to go116 * Remove use of log.

---
 .../go/miniprofiler_gae/miniprofiler_gae.go   |  6 +-
 .../github.com/mjibson/appstats/appstats.go   |  8 +--
 .../github.com/mjibson/appstats/handler.go    |  6 +-
 .../github.com/mjibson/goon/entity.go         |  4 +-
 _third_party/github.com/mjibson/goon/goon.go  |  8 +--
 .../github.com/mjibson/goon/goon_test.go      |  8 +--
 _third_party/github.com/mjibson/goon/query.go |  2 +-
 admin.go                                      | 28 ++-------
 app/app.go                                    |  2 +-
 app/templates/admin-feed.html                 | 11 ----
 app/templates/admin-user.html                 | 11 +---
 charge.go                                     |  8 +--
 dev.go                                        |  6 +-
 main.go                                       | 10 ++--
 tasks.go                                      | 45 +++-----------
 types.go                                      | 17 ++----
 user.go                                       | 59 +++++++------------
 utils.go                                      | 16 ++---
 18 files changed, 83 insertions(+), 172 deletions(-)

diff --git a/_third_party/github.com/MiniProfiler/go/miniprofiler_gae/miniprofiler_gae.go b/_third_party/github.com/MiniProfiler/go/miniprofiler_gae/miniprofiler_gae.go
index abcaa743..e0598f41 100644
--- a/_third_party/github.com/MiniProfiler/go/miniprofiler_gae/miniprofiler_gae.go
+++ b/_third_party/github.com/MiniProfiler/go/miniprofiler_gae/miniprofiler_gae.go
@@ -21,9 +21,9 @@ import (
 	"net/http"
 
 	"golang.org/x/net/context"
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/memcache"
-	"google.golang.org/appengine/user"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/memcache"
+	"google.golang.org/appengine/v2/user"
 	"github.com/mjibson/goread/_third_party/github.com/MiniProfiler/go/miniprofiler"
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/appstats"
 )
diff --git a/_third_party/github.com/mjibson/appstats/appstats.go b/_third_party/github.com/mjibson/appstats/appstats.go
index 11044b8c..ed457832 100644
--- a/_third_party/github.com/mjibson/appstats/appstats.go
+++ b/_third_party/github.com/mjibson/appstats/appstats.go
@@ -26,10 +26,10 @@ import (
 	"time"
 
 	"golang.org/x/net/context"
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/log"
-	"google.golang.org/appengine/memcache"
-	"google.golang.org/appengine/user"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/memcache"
+	"google.golang.org/appengine/v2/user"
 )
 
 var (
diff --git a/_third_party/github.com/mjibson/appstats/handler.go b/_third_party/github.com/mjibson/appstats/handler.go
index d022b4be..46bc1732 100644
--- a/_third_party/github.com/mjibson/appstats/handler.go
+++ b/_third_party/github.com/mjibson/appstats/handler.go
@@ -28,9 +28,9 @@ import (
 	"strings"
 	"time"
 
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/memcache"
-	"google.golang.org/appengine/user"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/memcache"
+	"google.golang.org/appengine/v2/user"
 )
 
 var templates *template.Template
diff --git a/_third_party/github.com/mjibson/goon/entity.go b/_third_party/github.com/mjibson/goon/entity.go
index 6ab2b5b2..46d5403f 100644
--- a/_third_party/github.com/mjibson/goon/entity.go
+++ b/_third_party/github.com/mjibson/goon/entity.go
@@ -26,8 +26,8 @@ import (
 	"sync"
 	"time"
 
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/datastore"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/datastore"
 )
 
 type fieldInfo struct {
diff --git a/_third_party/github.com/mjibson/goon/goon.go b/_third_party/github.com/mjibson/goon/goon.go
index 1a56206d..b6886859 100644
--- a/_third_party/github.com/mjibson/goon/goon.go
+++ b/_third_party/github.com/mjibson/goon/goon.go
@@ -28,10 +28,10 @@ import (
 
 	"golang.org/x/net/context"
 
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/log"
-	"google.golang.org/appengine/datastore"
-	"google.golang.org/appengine/memcache"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/memcache"
 )
 
 var (
diff --git a/_third_party/github.com/mjibson/goon/goon_test.go b/_third_party/github.com/mjibson/goon/goon_test.go
index 7751930c..d0f3fe73 100644
--- a/_third_party/github.com/mjibson/goon/goon_test.go
+++ b/_third_party/github.com/mjibson/goon/goon_test.go
@@ -22,10 +22,10 @@ import (
 	"testing"
 	"time"
 
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/aetest"
-	"google.golang.org/appengine/datastore"
-	"google.golang.org/appengine/memcache"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/aetest"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/memcache"
 )
 
 // *[]S, *[]*S, *[]I, []S, []*S, []I
diff --git a/_third_party/github.com/mjibson/goon/query.go b/_third_party/github.com/mjibson/goon/query.go
index ac879318..bebc90ec 100644
--- a/_third_party/github.com/mjibson/goon/query.go
+++ b/_third_party/github.com/mjibson/goon/query.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"google.golang.org/appengine/datastore"
+	"google.golang.org/appengine/v2/datastore"
 )
 
 // Count returns the number of results for the query.
diff --git a/admin.go b/admin.go
index 2e47436e..b247658f 100644
--- a/admin.go
+++ b/admin.go
@@ -24,9 +24,9 @@ import (
 	"strings"
 	"time"
 
-	"google.golang.org/appengine/log"
-	"google.golang.org/appengine/datastore"
-	"google.golang.org/appengine/memcache"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/memcache"
 
 	mpg "github.com/mjibson/goread/_third_party/github.com/MiniProfiler/go/miniprofiler_gae"
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/goon"
@@ -91,28 +91,13 @@ func AdminFeed(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		}
 	}
 	gn.GetMulti(stories)
-	lk := gn.Key(&Log{Parent: fk, Id: time.Now().Add(-time.Hour * 6).UnixNano()})
-	q = datastore.NewQuery(lk.Kind()).KeysOnly()
-	q = q.Ancestor(fk)
-	q = q.Filter("__key__ >", lk)
-	keys, _ = gn.GetAll(q, nil)
-	logs := make([]*Log, len(keys))
-	for j, key := range keys {
-		logs[j] = &Log{
-			Id:     key.IntID(),
-			Parent: fk,
-		}
-	}
-	gn.GetMulti(logs)
 
 	templates.ExecuteTemplate(w, "admin-feed.html", struct {
 		Feed    *Feed
-		Logs    []*Log
 		Stories []*Story
 		Now     time.Time
 	}{
 		&f,
-		logs,
 		stories,
 		time.Now(),
 	})
@@ -176,8 +161,7 @@ func AdminUser(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	it := gn.Run(q)
 	var u User
 	ud := UserData{Id: "data"}
-	var h []Log
-	k, err := it.Next(&u)
+	_, err := it.Next(&u)
 	if err != nil {
 		serveError(w, err)
 		return
@@ -202,16 +186,12 @@ func AdminUser(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		}
 		log.Infof(c, "opml updated")
 	}
-	q = datastore.NewQuery(gn.Kind(&Log{})).Ancestor(k)
-	_, err = gn.GetAll(q, &h)
 	if err := templates.ExecuteTemplate(w, "admin-user.html", struct {
 		User User
 		Data UserData
-		Log  []Log
 	}{
 		u,
 		ud,
-		h,
 	}); err != nil {
 		serveError(w, err)
 	}
diff --git a/app/app.go b/app/app.go
index 5c4ed1fe..89df3e49 100644
--- a/app/app.go
+++ b/app/app.go
@@ -29,7 +29,7 @@ func main() {
 */
 
 import (
-  "google.golang.org/appengine"
+  "google.golang.org/appengine/v2"
   _ "github.com/mjibson/goread"
   _ "github.com/mjibson/goread/_third_party/github.com/mjibson/appstats"
 )
diff --git a/app/templates/admin-feed.html b/app/templates/admin-feed.html
index 66e5d90c..51405ea5 100644
--- a/app/templates/admin-feed.html
+++ b/app/templates/admin-feed.html
@@ -25,17 +25,6 @@
 	<tr><td><a href="{{.Feed.Hub}}/subscription-details?hub.callback={{.Feed.PubSubURL}}&hub.topic={{.Feed.Url}}">pubsub</a></td></tr>
 </table>
 
-logs:
-<ul>
-{{range .Logs}}
-	<li>
-		{{nanotime .Id | since}}
-		{{nanotime .Id}}
-		{{.Text}}
-	</li>
-{{end}}
-</ul>
-
 stories:
 <ul>
 {{range .Stories}}
diff --git a/app/templates/admin-user.html b/app/templates/admin-user.html
index e299f6e8..33f1c6ab 100644
--- a/app/templates/admin-user.html
+++ b/app/templates/admin-user.html
@@ -25,14 +25,5 @@
 </textarea>
 <br><input type="submit" value="save">
 </form>
-<table>
-{{range .Log}}
-	<tr>
-		<td>{{nanotime .Id | since}}</td>
-		<td>{{nanotime .Id}}</td>
-		<td>{{.Text}}</td>
-	</tr>
-{{end}}
-</table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/charge.go b/charge.go
index e5c3531e..5da2d398 100644
--- a/charge.go
+++ b/charge.go
@@ -27,9 +27,9 @@ import (
 
 	mpg "github.com/mjibson/goread/_third_party/github.com/MiniProfiler/go/miniprofiler_gae"
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/goon"
-	"google.golang.org/appengine/log"
-	"google.golang.org/appengine/datastore"
-	"google.golang.org/appengine/user"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/user"
 )
 
 type Plan struct {
@@ -230,7 +230,7 @@ func doUncheckout(c mpg.Context) (*UserCharge, error) {
 }
 
 func stripe(c mpg.Context, method, urlStr, body string) (*http.Response, error) {
-  cl, cf := createHttpClient(c, time.Minute)
+	cl, cf := createHttpClient(c, time.Minute)
 	defer cf()
 	req, err := http.NewRequest(method, fmt.Sprintf("https://api.stripe.com/v1/%s", urlStr), strings.NewReader(body))
 	if err != nil {
diff --git a/dev.go b/dev.go
index 478c9706..4412303e 100644
--- a/dev.go
+++ b/dev.go
@@ -24,9 +24,9 @@ import (
 	mpg "github.com/mjibson/goread/_third_party/github.com/MiniProfiler/go/miniprofiler_gae"
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/goon"
 
-	"google.golang.org/appengine/log"
-	"google.golang.org/appengine/datastore"
-	"google.golang.org/appengine/user"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/user"
 )
 
 func ClearRead(c mpg.Context, w http.ResponseWriter, r *http.Request) {
diff --git a/main.go b/main.go
index 8ad7d7f2..526f767a 100644
--- a/main.go
+++ b/main.go
@@ -33,8 +33,8 @@ import (
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/goon"
 
 	"golang.org/x/net/context"
-	"google.golang.org/appengine/datastore"
-	alog "google.golang.org/appengine/log"
+	"google.golang.org/appengine/v2/datastore"
+	alog "google.golang.org/appengine/v2/log"
 )
 
 var (
@@ -64,9 +64,9 @@ func init() {
 	miniprofiler.ToggleShortcut = "Alt+C"
 	miniprofiler.Position = "bottomleft"
 
-  router := mux.NewRouter()
-  RegisterHandlers(router)
-  http.Handle("/", router)
+	router := mux.NewRouter()
+	RegisterHandlers(router)
+	http.Handle("/", router)
 }
 
 func RegisterHandlers(r *mux.Router) {
diff --git a/tasks.go b/tasks.go
index ee4fa134..7c3b2fea 100644
--- a/tasks.go
+++ b/tasks.go
@@ -37,11 +37,11 @@ import (
 	mpg "github.com/mjibson/goread/_third_party/github.com/MiniProfiler/go/miniprofiler_gae"
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/goon"
 
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/blobstore"
-	"google.golang.org/appengine/datastore"
-	"google.golang.org/appengine/log"
-	"google.golang.org/appengine/taskqueue"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/blobstore"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/taskqueue"
 )
 
 func ImportOpmlTask(c mpg.Context, w http.ResponseWriter, r *http.Request) {
@@ -159,20 +159,11 @@ func SubscribeCallback(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		w.Write([]byte(r.FormValue("hub.challenge")))
 		i, _ := strconv.Atoi(r.FormValue("hub.lease_seconds"))
 		f.Subscribed = time.Now().Add(time.Second * time.Duration(i))
-		gn.PutMulti([]interface{}{&f, &Log{
-			Parent: gn.Key(&f),
-			Id:     time.Now().UnixNano(),
-			Text:   "SubscribeCallback - subscribed - " + f.Subscribed.String(),
-		}})
+		gn.Put(&f)
 		log.Debugf(c, "subscribed: %v - %v", f.Url, f.Subscribed)
 		return
 	} else if !f.NotViewed() {
 		log.Infof(c, "push: %v", f.Url)
-		gn.Put(&Log{
-			Parent: gn.Key(&f),
-			Id:     time.Now().UnixNano(),
-			Text:   "SubscribeCallback - push update",
-		})
 		defer r.Body.Close()
 		b, _ := ioutil.ReadAll(r.Body)
 		nf, ss, err := ParseFeed(c, r.Header.Get("Content-Type"), f.Url, f.Url, b)
@@ -190,18 +181,9 @@ func SubscribeCallback(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 
 // Task used to subscribe a feed to push.
 func SubscribeFeed(c mpg.Context, w http.ResponseWriter, r *http.Request) {
-	start := time.Now()
 	gn := goon.FromContext(c)
 	f := Feed{Url: r.FormValue("feed")}
-	fk := gn.Key(&f)
 	s := ""
-	defer func() {
-		gn.Put(&Log{
-			Parent: fk,
-			Id:     time.Now().UnixNano(),
-			Text:   "SubscribeFeed - start " + start.String() + " - f.sub " + f.Subscribed.String() + " - " + s,
-		})
-	}()
 	if err := gn.Get(&f); err != nil {
 		log.Errorf(c, "%v: %v", err, f.Url)
 		serveError(w, err)
@@ -333,11 +315,7 @@ func updateFeed(c mpg.Context, url string, feed *Feed, stories []*Story, updateA
 	if err := gn.Get(&f); err != nil {
 		return fmt.Errorf("feed not found: %s", url)
 	}
-	gn.Put(&Log{
-		Parent: gn.Key(&f),
-		Id:     time.Now().UnixNano(),
-		Text:   "feed update",
-	})
+	log.Infof(c, "feed update: %s", url)
 
 	// Compare the feed's listed update to the story's update.
 	// Note: these may not be accurate, hence, only compare them to each other,
@@ -453,15 +431,8 @@ func UpdateFeed(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 	last := len(r.FormValue("last")) > 0
 	f := Feed{Url: url}
 	s := ""
-	defer func() {
-		gn.Put(&Log{
-			Parent: gn.Key(&f),
-			Id:     time.Now().UnixNano(),
-			Text:   "UpdateFeed - " + s,
-		})
-	}()
 	if err := gn.Get(&f); err == datastore.ErrNoSuchEntity {
-		log.Errorf(c, "no such entity - " + url)
+		log.Errorf(c, "no such entity - "+url)
 		s += "NSE"
 		return
 	} else if err != nil {
diff --git a/types.go b/types.go
index a9b91891..11b965e2 100644
--- a/types.go
+++ b/types.go
@@ -28,11 +28,11 @@ import (
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/goon"
 
 	"golang.org/x/net/context"
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/datastore"
-	"google.golang.org/appengine/log"
-	"google.golang.org/appengine/taskqueue"
-	"google.golang.org/appengine/user"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/taskqueue"
+	"google.golang.org/appengine/v2/user"
 )
 
 type User struct {
@@ -144,12 +144,7 @@ type Feed struct {
 
 func (f *Feed) Subscribe(c context.Context) {
 	if !f.IsSubscribed() {
-		gn := goon.FromContext(c)
-		gn.Put(&Log{
-			Parent: gn.Key(&f),
-			Id:     time.Now().UnixNano(),
-			Text:   fmt.Sprintf("Subscribe %v", f.Subscribed.String()),
-		})
+		log.Infof(c, "Subscribe %v", f.Subscribed.String())
 		t := taskqueue.NewPOSTTask(routeUrl("subscribe-feed"), url.Values{
 			"feed": {f.Url},
 		})
diff --git a/user.go b/user.go
index 3c369f52..4796e199 100644
--- a/user.go
+++ b/user.go
@@ -41,12 +41,12 @@ import (
 	"github.com/mjibson/goread/_third_party/github.com/mjibson/goon"
 	"github.com/mjibson/goread/sanitizer"
 
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/blobstore"
-	"google.golang.org/appengine/datastore"
-	"google.golang.org/appengine/log"
-	"google.golang.org/appengine/taskqueue"
-	"google.golang.org/appengine/user"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/blobstore"
+	"google.golang.org/appengine/v2/datastore"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/taskqueue"
+	"google.golang.org/appengine/v2/user"
 )
 
 func LoginGoogle(c mpg.Context, w http.ResponseWriter, r *http.Request) {
@@ -192,11 +192,7 @@ func AddSubscription(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		serveError(w, err)
 		return
 	}
-	gn.PutMulti([]interface{}{&ud, &Log{
-		Parent: ud.Parent,
-		Id:     time.Now().UnixNano(),
-		Text:   fmt.Sprintf("add sub: %v", url),
-	}})
+	log.Infof(c, "add sub: %v", url)
 	if r.Method == "GET" {
 		http.Redirect(w, r, routeUrl("main"), http.StatusFound)
 	}
@@ -216,12 +212,8 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		serveError(w, err)
 		return
 	}
-	l := &Log{
-		Parent: ud.Parent,
-		Id:     time.Now().UnixNano(),
-		Text:   "list feeds",
-	}
-	l.Text += fmt.Sprintf(", len opml %v", len(ud.Opml))
+	l := "list feeds"
+	l += fmt.Sprintf(", len opml %v", len(ud.Opml))
 	putU := false
 	putUD := false
 	fixRead := false
@@ -229,7 +221,7 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		u.Read = time.Now().Add(-oldDuration)
 		putU = true
 		fixRead = true
-		l.Text += ", u.Read"
+		l += ", u.Read"
 	}
 	trialRemaining := 0
 	if STRIPE_KEY != "" && ud.Opml != nil && u.Account == AFree && u.Until.Before(time.Now()) {
@@ -313,7 +305,7 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 						gn.GetMulti(stories)
 					}
 					if f.Link != opmlMap[f.Url].HtmlUrl {
-						l.Text += fmt.Sprintf(", link: %v -> %v", opmlMap[f.Url].HtmlUrl, f.Link)
+						l += fmt.Sprintf(", link: %v -> %v", opmlMap[f.Url].HtmlUrl, f.Link)
 						updatedLinks = true
 						opmlMap[f.Url].HtmlUrl = f.Link
 					}
@@ -415,7 +407,7 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 				gob.NewEncoder(&b).Encode(&read)
 				ud.Read = b.Bytes()
 				putUD = true
-				l.Text += ", fix read"
+				l += ", fix read"
 			}
 		})
 	}
@@ -431,7 +423,7 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		fl[k] = newStories
 	}
 	if numStories == 0 {
-		l.Text += ", clear read"
+		l += ", clear read"
 		fixRead = false
 		if ud.Read != nil {
 			putUD = true
@@ -454,21 +446,21 @@ func ListFeeds(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		if o, err := json.Marshal(&uf); err == nil {
 			ud.Opml = o
 			putUD = true
-			l.Text += ", update links"
+			l += ", update links"
 		} else {
 			log.Errorf(c, "json UL err: %v, %v", err, uf)
 		}
 	}
 	if putU {
 		gn.Put(u)
-		l.Text += ", putU"
+		l += ", putU"
 	}
 	if putUD {
 		gn.Put(ud)
-		l.Text += ", putUD"
+		l += ", putUD"
 	}
-	l.Text += fmt.Sprintf(", len opml %v", len(ud.Opml))
-	gn.Put(l)
+	l += fmt.Sprintf(", len opml %v", len(ud.Opml))
+	log.Infof(c, l)
 	c.Step("json marshal", func(c mpg.Context) {
 		gn := goon.FromContext(c)
 		o := struct {
@@ -660,13 +652,9 @@ func UploadOpml(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 		log.Errorf(c, "json err: %v", err)
 		return
 	} else {
-		l := Log{
-			Parent: ud.Parent,
-			Id:     time.Now().UnixNano(),
-			Text:   fmt.Sprintf("upload opml: %v -> %v", len(ud.Opml), len(b)),
-		}
+		log.Infof(c, "upload opml: %v -> %v", len(ud.Opml), len(b))
 		ud.Opml = b
-		if _, err := gn.PutMulti([]interface{}{&ud, &l}); err != nil {
+		if _, err := gn.Put(&ud); err != nil {
 			serveError(w, err)
 			return
 		}
@@ -734,11 +722,8 @@ func SaveOptions(c mpg.Context, w http.ResponseWriter, r *http.Request) {
 			return nil
 		}
 		u.Options = r.FormValue("options")
-		_, err := gn.PutMulti([]interface{}{&u, &Log{
-			Parent: gn.Key(&u),
-			Id:     time.Now().UnixNano(),
-			Text:   fmt.Sprintf("save options: %v", len(u.Options)),
-		}})
+		_, err := gn.Put(&u)
+		log.Infof(c, "save options: %v", len(u.Options))
 		return err
 	}, nil)
 }
diff --git a/utils.go b/utils.go
index 468ca184..4993b0e5 100644
--- a/utils.go
+++ b/utils.go
@@ -43,22 +43,22 @@ import (
 	"github.com/mjibson/goread/sanitizer"
 
 	"golang.org/x/net/context"
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/memcache"
-	"google.golang.org/appengine/taskqueue"
-	"google.golang.org/appengine/log"
-	"google.golang.org/appengine/urlfetch"
-	"google.golang.org/appengine/user"
+	"google.golang.org/appengine/v2"
+	"google.golang.org/appengine/v2/log"
+	"google.golang.org/appengine/v2/memcache"
+	"google.golang.org/appengine/v2/taskqueue"
+	"google.golang.org/appengine/v2/urlfetch"
+	"google.golang.org/appengine/v2/user"
 )
 
 func createHttpClient(c context.Context, t time.Duration) (*http.Client, context.CancelFunc) {
 	c1, cf := context.WithTimeout(c, t)
 	cl := &http.Client{
 		Transport: &urlfetch.Transport{
-			Context:  c1,
+			Context: c1,
 		},
 	}
-  return cl, cf
+	return cl, cf
 }
 
 func serveError(w http.ResponseWriter, err error) {