aclindsa/go-asink
1
0
Fork 0
Code Releases Activity

Fix server error message, go fmt

Browse Source
This commit is contained in:
Aaron Lindsay
2013-03-18 07:17:44 -04:00
parent ad8156210f
commit 3a166dbc9a
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/database.go
View File

@ -11,7 +11,7 @@ import (
)
type AsinkDB struct {
db *sql.DB
db *sql.DB
lock sync.Mutex
}

9
client/net.go
View File

@ -12,7 +12,7 @@ import (
"time"
)
const MIN_ERROR_WAIT = 100 // 1/10 of a second
const MIN_ERROR_WAIT = 100 // 1/10 of a second
const MAX_ERROR_WAIT = 10000 // 10 seconds
func SendEvent(globals AsinkGlobals, event *asink.Event) error {
@ -68,7 +68,7 @@ func GetEvents(globals AsinkGlobals, events chan *asink.Event) {
}
//query DB for latest remote event version number that we've seen locally
latestEvent, err := globals.db.DatabaseLatestRemoteEvent()
latestEvent, err := globals.db.DatabaseLatestRemoteEvent()
if err != nil {
panic(err)
}
@ -77,7 +77,7 @@ func GetEvents(globals AsinkGlobals, events chan *asink.Event) {
//query for events after latest_event
var fullUrl string
if latestEvent != nil {
fullUrl = url + strconv.FormatInt(latestEvent.Id + 1, 10)
fullUrl = url + strconv.FormatInt(latestEvent.Id+1, 10)
} else {
fullUrl = url + "0"
}
@ -110,9 +110,8 @@ func GetEvents(globals AsinkGlobals, events chan *asink.Event) {
continue
}
for _, event := range apistatus.Events {
if latestEvent != nil && event.Id != latestEvent.Id + 1 {
if latestEvent != nil && event.Id != latestEvent.Id+1 {
break
}
events <- event