diff options
author | Christian Pointner <equinox@spreadspace.org> | 2017-04-22 03:00:32 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2017-04-22 03:00:32 +0200 |
commit | b6214c3bbcbad8f0e8355cf9e81e408e92a0aa61 (patch) | |
tree | 5ea8160be3bf56fa1d946acad6a7f4cb446a25af /src/hub | |
parent | upgrade to gorp v2 (diff) |
fix a lot of masked return values (mostly errors)
Diffstat (limited to 'src/hub')
-rw-r--r-- | src/hub/.gitignore | 1 | ||||
-rw-r--r-- | src/hub/src/spreadspace.org/sfive/s5cvt.go | 4 | ||||
-rw-r--r-- | src/hub/src/spreadspace.org/sfive/s5srv.go | 12 | ||||
-rw-r--r-- | src/hub/src/spreadspace.org/sfive/s5srvForward.go | 14 | ||||
-rw-r--r-- | src/hub/src/spreadspace.org/sfive/s5srvForwardEs.go | 13 | ||||
-rw-r--r-- | src/hub/src/spreadspace.org/sfive/s5store.go | 37 |
6 files changed, 45 insertions, 36 deletions
diff --git a/src/hub/.gitignore b/src/hub/.gitignore index 7adb71a..16dc168 100644 --- a/src/hub/.gitignore +++ b/src/hub/.gitignore @@ -1,4 +1,5 @@ /src/github.com +/src/gopkg.in /src/golang.org /bin /pkg diff --git a/src/hub/src/spreadspace.org/sfive/s5cvt.go b/src/hub/src/spreadspace.org/sfive/s5cvt.go index 330e2c1..cd65cf7 100644 --- a/src/hub/src/spreadspace.org/sfive/s5cvt.go +++ b/src/hub/src/spreadspace.org/sfive/s5cvt.go @@ -40,11 +40,11 @@ func NewStatefulDecoder(jsonString []byte) (decoder StatsDecoder, err error) { return } -func NewPlainDecoder() (decoder StatsDecoder) { +func NewPlainDecoder() StatsDecoder { return new(PlainDecoder) } -func NewFilterDecoder() (decoder FilterDecoder) { +func NewFilterDecoder() FilterDecoder { return new(filterDecoder) } diff --git a/src/hub/src/spreadspace.org/sfive/s5srv.go b/src/hub/src/spreadspace.org/sfive/s5srv.go index 1946414..9cf4c64 100644 --- a/src/hub/src/spreadspace.org/sfive/s5srv.go +++ b/src/hub/src/spreadspace.org/sfive/s5srv.go @@ -113,24 +113,20 @@ func (self StatsSinkServer) appendActor() { } } -func (self StatsSinkServer) getUpdatesAfterInvoke(id int) (values []StatisticsData, err error) { +func (self StatsSinkServer) getUpdatesAfterInvoke(id int) ([]StatisticsData, error) { token := getUpdatesAfterToken{id: id, response: make(chan getUpdatesResult, 1)} defer close(token.response) self.getUpdatesAfterChan <- token res := <-token.response - values = res.values - err = res.err - return + return res.values, res.err } -func (self StatsSinkServer) getUpdatesInvoke(filter *StatsFilter) (values []StatisticsData, err error) { +func (self StatsSinkServer) getUpdatesInvoke(filter *StatsFilter) ([]StatisticsData, error) { token := getUpdatesToken{filter: filter, response: make(chan getUpdatesResult, 1)} defer close(token.response) self.getUpdatesChan <- token res := <-token.response - values = res.values - err = res.err - return + return res.values, res.err } func (self StatsSinkServer) getStatsInvoke(filter *StatsFilter) (StatsResult, error) { diff --git a/src/hub/src/spreadspace.org/sfive/s5srvForward.go b/src/hub/src/spreadspace.org/sfive/s5srvForward.go index 8014ff2..a072b2a 100644 --- a/src/hub/src/spreadspace.org/sfive/s5srvForward.go +++ b/src/hub/src/spreadspace.org/sfive/s5srvForward.go @@ -28,7 +28,8 @@ func (self StatsSinkServer) getLastUpdate(baseurl string, client *http.Client) ( return } - resp, err := client.Get(baseurl + "/lastupdate/" + storeId) + var resp *http.Response + resp, err = client.Get(baseurl + "/lastupdate/" + storeId) if err != nil { s5l.Printf("fwd: failed to query for lastupdate: %v\n", err) return @@ -40,7 +41,8 @@ func (self StatsSinkServer) getLastUpdate(baseurl string, client *http.Client) ( return } - body, err := ioutil.ReadAll(resp.Body) + var body []byte + body, err = ioutil.ReadAll(resp.Body) if err != nil { s5l.Printf("fwd: failed to read lastupdate response: %v\n", err) return @@ -49,10 +51,10 @@ func (self StatsSinkServer) getLastUpdate(baseurl string, client *http.Client) ( if len(body) == 0 { latestId = -1 } else { - tid, errl := strconv.ParseInt(string(body), 10, 32) - if errl != nil { - s5l.Printf("fwd: invalid lastupdate response: %v\n", errl) - err = errl + var tid int64 + tid, err = strconv.ParseInt(string(body), 10, 32) + if err != nil { + s5l.Printf("fwd: invalid lastupdate response: %v\n", err) return } latestId = int(tid) diff --git a/src/hub/src/spreadspace.org/sfive/s5srvForwardEs.go b/src/hub/src/spreadspace.org/sfive/s5srvForwardEs.go index 515a217..d377a8b 100644 --- a/src/hub/src/spreadspace.org/sfive/s5srvForwardEs.go +++ b/src/hub/src/spreadspace.org/sfive/s5srvForwardEs.go @@ -28,7 +28,8 @@ func (self StatsSinkServer) getLastUpdateEs(baseurl string, client *http.Client) queryJson := fmt.Sprintf(lastUpdateJson, storeId) s5tl.Printf("fwd-es: query: %s", queryJson) - resp, err := client.Post(url, "application/json", strings.NewReader(queryJson)) + var resp *http.Response + resp, err = client.Post(url, "application/json", strings.NewReader(queryJson)) if err != nil { s5l.Printf("fwd-es: failed to query for lastupdate: %v\n", err) return @@ -40,7 +41,8 @@ func (self StatsSinkServer) getLastUpdateEs(baseurl string, client *http.Client) return } - body, err := ioutil.ReadAll(resp.Body) + var body []bytes + body, err = ioutil.ReadAll(resp.Body) if err != nil { s5l.Printf("fwd-es: failed to read lastupdate response: %v\n", err) return @@ -52,10 +54,9 @@ func (self StatsSinkServer) getLastUpdateEs(baseurl string, client *http.Client) latestId = -1 } else { var value interface{} - errl := json.Unmarshal(body, &value) - if errl != nil { - s5l.Printf("fwd-es: invalid lastupdate response: %v\n", errl) - err = errl + err = json.Unmarshal(body, &value) + if err != nil { + s5l.Printf("fwd-es: invalid lastupdate response: %v\n", err) return } diff --git a/src/hub/src/spreadspace.org/sfive/s5store.go b/src/hub/src/spreadspace.org/sfive/s5store.go index 5fd10ee..6fb5f8a 100644 --- a/src/hub/src/spreadspace.org/sfive/s5store.go +++ b/src/hub/src/spreadspace.org/sfive/s5store.go @@ -207,7 +207,8 @@ func (s sqliteStore) findTag(name string) (tag *tagDb, err error) { func (s sqliteStore) insertNewTags(tags []tagDb) (err error) { for i := range tags { - t, err := s.findTag(tags[i].Name) + var t *tagDb + t, err = s.findTag(tags[i].Name) if err != nil { _, err = s.db.Exec("insert into "+tagsTn+" VALUES (NULL, ?)", tags[i].Name) } @@ -241,7 +242,8 @@ func (s sqliteStore) findSource(src sourceDb) (res *sourceDb, err error) { } func (s sqliteStore) insertNewSource(src *sourceDb) (err error) { - t, err := s.findSource(*src) + var t *sourceDb + t, err = s.findSource(*src) if err == nil { *src = *t } else { @@ -326,7 +328,8 @@ func (s sqliteStore) appendItem(du dataUpdateDb, cd []clientDataDb, src sourceDb // this function is the biggest pile of copy/pasted crap while sick that is still compilable. func (s sqliteStore) Append(update StatisticsData) (err error) { - tx, err := s.db.Begin() + var tx *gorp.Transaction + tx, err = s.db.Begin() if err != nil { return } @@ -343,7 +346,8 @@ func (s sqliteStore) Append(update StatisticsData) (err error) { } func (s sqliteStore) AppendMany(updates []StatisticsData) (err error) { - tx, err := s.db.Begin() + var tx *gorp.Transaction + tx, err = s.db.Begin() if err != nil { return } @@ -378,7 +382,8 @@ func (s sqliteStore) GetTags() ([]string, error) { } func (s sqliteStore) GetTagsByDataUpdateId(id int) (res []string, err error) { - qres, err := s.db.Select( + var qres []interface{} + qres, err = s.db.Select( tagDb{}, "select * from "+tagsTn+" where Id in (select TagId from "+sourceTagsTn+" where SourceId = (select SourceId from "+dataUpdatesTn+" where Id = ?))", id) if err == nil { @@ -391,7 +396,8 @@ func (s sqliteStore) GetTagsByDataUpdateId(id int) (res []string, err error) { } func (s sqliteStore) GetSources() (res []sourceDb, err error) { - qres, err := s.db.Select(sourceDb{}, "select * from "+sourcesTn) + var qres []interface{} + qres, err = s.db.Select(sourceDb{}, "select * from "+sourcesTn) if err == nil { res = make([]sourceDb, len(qres)) for i := range qres { @@ -412,7 +418,8 @@ func (s sqliteStore) GetUpdate(id int) (res dataUpdateDb, err error) { } func (s sqliteStore) GetClientsByUpdateId(id int) (res []clientDataDb, err error) { - qres, err := s.db.Select(clientDataDb{}, "select * from "+clientdataUpdatesTn+" where DataUpdatesId = ?", id) + var qres []interface{} + qres, err = s.db.Select(clientDataDb{}, "select * from "+clientdataUpdatesTn+" where DataUpdatesId = ?", id) if err == nil { res = make([]clientDataDb, len(qres)) for i := range qres { @@ -440,7 +447,8 @@ var ( ) func (s sqliteStore) CreateStatisticsDataFrom(dat dataUpdateQueryResult) (res StatisticsData, err error) { - clientsDb, err := s.GetClientsByUpdateId(dat.Id) + var clientsDb []clientDataDb + clientsDb, err = s.GetClientsByUpdateId(dat.Id) if err != nil { s5l.Printf("store GetClients failed: %v", err) return @@ -473,7 +481,8 @@ func (s sqliteStore) GetUpdatesAfter(id int) (res []StatisticsData, err error) { limit := 5000 sourceSql, parameters := getFilteredDataUpdateSelect(&StatsFilter{afterUpdateId: &id, limit: &limit}) sql := "SELECT " + updateColumnSelect + " FROM " + sourceSql - updates, err := s.db.Select(dataUpdateQueryResult{}, sql, parameters) + var updates []interface{} + updates, err = s.db.Select(dataUpdateQueryResult{}, sql, parameters) s5tl.Printf("sql: %s", sql) if err == nil { res, _ = s.CreateStatisticsDatasFrom(updates) @@ -485,7 +494,8 @@ func (s sqliteStore) GetUpdates(filter *StatsFilter) (res []StatisticsData, err sourceSql, parameters := getFilteredDataUpdateSelect(filter) sql := "SELECT " + updateColumnSelect + " FROM " + sourceSql s5tl.Printf("store: sql: %s", sql) - updates, err := s.db.Select(dataUpdateQueryResult{}, sql, parameters) + var updates []interface{} + updates, err = s.db.Select(dataUpdateQueryResult{}, sql, parameters) if err == nil { res, _ = s.CreateStatisticsDatasFrom(updates) } @@ -620,13 +630,12 @@ func (s sqliteStore) GetStoreId() (uuid string, err error) { return } -func NewStore(mysql bool, path string) (store sqliteStore, err error) { +func NewStore(mysql bool, path string) (sqliteStore, error) { db, hubid, err := initDb(mysql, path) if err != nil { - return + return sqliteStore{}, err } - store = sqliteStore{db, hubid} - return + return sqliteStore{db, hubid}, nil } func (s sqliteStore) Close() { |