Bump tlib

interline-io · Feb 3, 2024 · 7049433 · 7049433
1 parent 1d7a3ee
commit 7049433
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/actions/fetch.go b/actions/fetch.go
@@ -69,13 +69,13 @@ func StaticFetch(ctx context.Context, feedId string, feedSrc io.Reader, feedUrl
 	mr := model.FeedVersionFetchResult{}
 	db := tldb.NewPostgresAdapterFromDBX(dbf.DBX())
 	if err := db.Tx(func(atx tldb.Adapter) error {
-		fv, fr, err := fetch.StaticFetch(atx, fetchOpts)
+		fr, err := fetch.StaticFetch(atx, fetchOpts)
 		if err != nil {
 			return err
 		}
 		mr.FoundSHA1 = fr.Found
-		if fr.FetchError == nil {
-			mr.FeedVersion = &model.FeedVersion{FeedVersion: fv}
+		if fr.FetchError == nil && fr.FeedVersion != nil {
+			mr.FeedVersion = &model.FeedVersion{FeedVersion: *fr.FeedVersion}
 			mr.FetchError = nil
 		} else {
 			a := fr.FetchError.Error()
@@ -113,11 +113,11 @@ func RTFetch(ctx context.Context, target string, feedId string, feedUrl string,
 	var rtMsg *pb.FeedMessage
 	var fetchErr error
 	if err := tldb.NewPostgresAdapterFromDBX(cfg.Finder.DBX()).Tx(func(atx tldb.Adapter) error {
-		m, fr, err := fetch.RTFetch(atx, fetchOpts)
+		fr, err := fetch.RTFetch(atx, fetchOpts)
 		if err != nil {
 			return err
 		}
-		rtMsg = m
+		rtMsg = fr.Message
 		fetchErr = fr.FetchError
 		return nil
 	}); err != nil {

diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/hypirion/go-filecache v0.0.0-20160810125507-e3e6ef6981f0
 	github.com/interline-io/log v0.0.0-20240126000327-05bb90e4de4f
 	github.com/interline-io/transitland-dbutil v0.0.0-20240126000951-f2dcc062261d
-	github.com/interline-io/transitland-lib v0.14.1-0.20240203003317-fa69fe19f22b
+	github.com/interline-io/transitland-lib v0.14.1-0.20240203022154-43b45c50e2b1
 	github.com/interline-io/transitland-mw v0.0.0-20240126001316-f41a91e24d87
 	github.com/jellydator/ttlcache/v2 v2.11.1
 	github.com/jmoiron/sqlx v1.3.5

diff --git a/go.sum b/go.sum
@@ -265,8 +265,8 @@ github.com/interline-io/log v0.0.0-20240126000327-05bb90e4de4f h1:yZuyLK/XJqVOHx
 github.com/interline-io/log v0.0.0-20240126000327-05bb90e4de4f/go.mod h1:chJaM8SKcHI6ivoeFuZ8M8axTjSV4TPmuQ+sAyAHa34=
 github.com/interline-io/transitland-dbutil v0.0.0-20240126000951-f2dcc062261d h1:LL9U0HlBmgq924fQojTSKc7v5VqXdwLVp8ULb701Dz0=
 github.com/interline-io/transitland-dbutil v0.0.0-20240126000951-f2dcc062261d/go.mod h1:g10ZeVhMjO+D/DDggLAjqJ4RhYfuQu4MEpgh9vuWmVc=
-github.com/interline-io/transitland-lib v0.14.1-0.20240203003317-fa69fe19f22b h1:WcB2ukHUzEm33hDZ4iaTfkYthUa7QTnsZlZIcy1A+Y8=
-github.com/interline-io/transitland-lib v0.14.1-0.20240203003317-fa69fe19f22b/go.mod h1:QeAjZTDdxWJlD+lGCeoImiM3FsKy8WS1lOQi3/lRydk=
+github.com/interline-io/transitland-lib v0.14.1-0.20240203022154-43b45c50e2b1 h1:5GHYf0B+Aq5nLCMIoJohbz8YcutRNcHhxpAYmwFwEnw=
+github.com/interline-io/transitland-lib v0.14.1-0.20240203022154-43b45c50e2b1/go.mod h1:QeAjZTDdxWJlD+lGCeoImiM3FsKy8WS1lOQi3/lRydk=
 github.com/interline-io/transitland-mw v0.0.0-20240126001316-f41a91e24d87 h1:uuzbxmdL+vQc4gQIjaERfjmhpfwwo+nTemPRPPbOAwo=
 github.com/interline-io/transitland-mw v0.0.0-20240126001316-f41a91e24d87/go.mod h1:BD6S0PL96r/ZWpw4jxRAqnvvcdZKj7Dh0Qqpxsz42AY=
 github.com/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInww=