Addressed twifkak comments: refactored IsHealthy, also added healthz …

…http handler.
ampproject · Oct 23, 2019 · bb2b939 · bb2b939
1 parent 8c67122
commit bb2b939
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packager/signer/signer.go b/packager/signer/signer.go
@@ -128,7 +128,7 @@ type Signer struct {
 	client                  *http.Client
 	urlSets                 []util.URLSet
 	rtvCache                *rtv.RTVCache
-	shouldPackage           func() bool
+	shouldPackage           func() error
 	overrideBaseURL         *url.URL
 	requireHeaders          bool
 	forwardedRequestHeaders []string
@@ -460,7 +460,7 @@ func (this *Signer) serveSignedExchange(resp http.ResponseWriter, fetchResp *htt
 			fetchResp.Header.Get("Content-Security-Policy")))
 
 	exchange := signedexchange.NewExchange(
-		accept.SxgVersion, /*uri=*/signURL.String(), /*method=*/"GET",
+		accept.SxgVersion /*uri=*/, signURL.String() /*method=*/, "GET",
 		http.Header{}, fetchResp.StatusCode, fetchResp.Header, []byte(transformed))
 	if err := exchange.MiEncodePayload(miRecordSize); err != nil {
 		util.NewHTTPError(http.StatusInternalServerError, "Error MI-encoding: ", err).LogAndRespond(resp)

diff --git a/packager/signer/signer_test.go b/packager/signer/signer_test.go
@@ -63,7 +63,11 @@ func (this fakeCertHandler)  GetLatestCert() (*x509.Certificate) {
 	return pkgt.Certs[0]
 }
 
+<<<<<<< HEAD
 func (this fakeCertHandler)  IsHealthy() error {
+=======
+func (this fakeCertHandler) IsHealthy() error {
+>>>>>>> Addressed twifkak comments: refactored IsHealthy, also added healthz http handler.
 	return nil
 }