Skip to content
This repository has been archived by the owner on Mar 16, 2020. It is now read-only.

Commit

Permalink
* Migrate to go116
Browse files Browse the repository at this point in the history 
* Remove use of log.
  • Loading branch information
Harish JP committed Jan 16, 2022
1 parent 20a0706 commit 03335b0
Show file tree
Hide file tree
Showing 18 changed files with 83 additions and 172 deletions.
6 changes: 3 additions & 3 deletions _third_party/github.com/MiniProfiler/go/miniprofiler_gae/miniprofiler_gae.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
8 changes: 4 additions & 4 deletions _third_party/github.com/mjibson/appstats/appstats.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions _third_party/github.com/mjibson/appstats/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions _third_party/github.com/mjibson/goon/entity.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions _third_party/github.com/mjibson/goon/goon.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
8 changes: 4 additions & 4 deletions _third_party/github.com/mjibson/goon/goon_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion _third_party/github.com/mjibson/goon/query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
28 changes: 4 additions & 24 deletions admin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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(),
})
Expand Down Expand Up @@ -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
Expand All @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
11 changes: 0 additions & 11 deletions app/templates/admin-feed.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
11 changes: 1 addition & 10 deletions app/templates/admin-user.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
</html>
8 changes: 4 additions & 4 deletions charge.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions dev.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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) {
Expand Down
45 changes: 8 additions & 37 deletions tasks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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 {
Expand Down
17 changes: 6 additions & 11 deletions types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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},
})
Expand Down
Loading

0 comments on commit 03335b0

Please sign in to comment.