mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
d56a49b321
Largely a removal job, however many tests, particularly system level ones relied on Routes. These have been migrated to use Fns. * Add 410 response to swagger * No app names in log tags * Adding constraint in GetCall for FnID * Adding test to check FnID is required on call * Add fn_id to call selector * Fix text in docker mem warning * Correct buildConfig func name * Test fix up * Removing CPU setting from Agent test CPU setting has been deprecated, but the code base is still riddled with it. This just removes it from this layer. Really we need to remove it from Call. * Remove fn id check on calls * Reintroduce fn id required on call * Adding fnID to calls for execute test * Correct setting of app id in middleware * Removes root middlewares ability to redirect fun invocations * Add over sized test check * Removing call fn id check
76 lines
1.6 KiB
Go
76 lines
1.6 KiB
Go
package server
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"net/http"
|
|
|
|
"errors"
|
|
"strings"
|
|
|
|
"github.com/fnproject/fn/api"
|
|
"github.com/fnproject/fn/api/models"
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
// note: for backward compatibility, will go away later
|
|
type callLogResponse struct {
|
|
Message string `json:"message"`
|
|
Log *callLog `json:"log"`
|
|
}
|
|
|
|
type callLog struct {
|
|
CallID string `json:"call_id" db:"id"`
|
|
Log string `json:"log" db:"log"`
|
|
}
|
|
|
|
func writeJSON(c *gin.Context, callID string, logReader io.Reader) {
|
|
var b bytes.Buffer
|
|
b.ReadFrom(logReader)
|
|
c.JSON(http.StatusOK, callLogResponse{"Successfully loaded log",
|
|
&callLog{
|
|
CallID: callID,
|
|
Log: b.String(),
|
|
}})
|
|
}
|
|
|
|
func (s *Server) handleCallLogGet(c *gin.Context) {
|
|
ctx := c.Request.Context()
|
|
|
|
fnID := c.Param(api.ParamFnID)
|
|
callID := c.Param(api.ParamCallID)
|
|
|
|
logReader, err := s.logstore.GetLog(ctx, fnID, callID)
|
|
if err != nil {
|
|
handleErrorResponse(c, err)
|
|
return
|
|
}
|
|
|
|
mimeTypes, _ := c.Request.Header["Accept"]
|
|
|
|
if len(mimeTypes) == 0 {
|
|
writeJSON(c, callID, logReader)
|
|
return
|
|
}
|
|
|
|
for _, mimeType := range mimeTypes {
|
|
if strings.Contains(mimeType, "application/json") {
|
|
writeJSON(c, callID, logReader)
|
|
return
|
|
}
|
|
if strings.Contains(mimeType, "text/plain") {
|
|
io.Copy(c.Writer, logReader)
|
|
return
|
|
|
|
}
|
|
if strings.Contains(mimeType, "*/*") {
|
|
writeJSON(c, callID, logReader)
|
|
return
|
|
}
|
|
}
|
|
|
|
// if we've reached this point it means that Fn didn't recognize Accepted content type
|
|
handleErrorResponse(c, models.NewAPIError(http.StatusNotAcceptable,
|
|
errors.New("unable to respond within acceptable response content types")))
|
|
}
|