fixed lock problem in functions module (#1279)

Author: YourTechBud

gateway/modules/functions/helpers.go

@@ -49,7 +49,7 @@ func (m *Module) handleCall(ctx context.Context, serviceID, endpointID, token st
 		url = endpointPath
 
 	case config.EndpointKindPrepared:
-		url = fmt.Sprintf("http://localhost:4122/v1/api/%s/graphql", m.project)
+		url = fmt.Sprintf("http://localhost:4122/v1/api/%s/graphql", m.getProject())
 
 	default:
 		return http.StatusBadRequest, nil, helpers.Logger.LogError(helpers.GetRequestID(ctx), fmt.Sprintf("Invalid endpoint kind (%s) provided", endpoint.Kind), nil, nil)
@@ -126,6 +126,9 @@ func prepareHeaders(ctx context.Context, headers config.Headers, state map[strin
 }
 
 func (m *Module) adjustReqBody(ctx context.Context, serviceID, endpointID, token string, endpoint *config.Endpoint, auth, params interface{}) (interface{}, error) {
+	m.lock.RLock()
+	defer m.lock.RUnlock()
+
 	var req, graph interface{}
 	var err error
 
@@ -162,6 +165,9 @@ func (m *Module) adjustReqBody(ctx context.Context, serviceID, endpointID, token
 }
 
 func (m *Module) adjustResBody(ctx context.Context, serviceID, endpointID, token string, endpoint *config.Endpoint, auth, params interface{}) (interface{}, error) {
+	m.lock.RLock()
+	defer m.lock.RUnlock()
+
 	var res interface{}
 	var err error
 
@@ -222,13 +228,23 @@ func loadParam(ctx context.Context, key string, claims, params interface{}) (str
 }
 
 func (m *Module) loadService(service string) *config.Service {
+	m.lock.RLock()
+	defer m.lock.RUnlock()
+
 	if s, p := m.config.InternalServices[service]; p {
 		return s
 	}
 
 	return m.config.Services[service]
 }
 
+func (m *Module) getProject() string {
+	m.lock.RLock()
+	defer m.lock.RUnlock()
+
+	return m.project
+}
+
 func (m *Module) createGoTemplate(kind, serviceID, endpointID, tmpl string) error {
 	key := getGoTemplateKey(kind, serviceID, endpointID)
 

gateway/modules/functions/operations.go

@@ -2,38 +2,19 @@ package functions
 
 import (
 	"context"
-	"time"
 
 	"github.com/spaceuptech/space-cloud/gateway/config"
 	"github.com/spaceuptech/space-cloud/gateway/model"
 )
 
-// Call simply calls a function on a service
-func (m *Module) Call(service, function, token string, reqParams model.RequestParams, params interface{}, timeout int) (int, interface{}, error) {
-	m.lock.RLock()
-	defer m.lock.RUnlock()
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(timeout)*time.Second)
-	defer cancel()
-
-	status, result, err := m.handleCall(ctx, service, function, token, reqParams.Claims, params)
-	if err != nil {
-		return status, result, err
-	}
-	m.metricHook(m.project, service, function)
-	return status, result, nil
-}
-
 // CallWithContext invokes function on a service. The response from the function is returned back along with
 // any errors if they occurred.
 func (m *Module) CallWithContext(ctx context.Context, service, function, token string, reqParams model.RequestParams, params interface{}) (int, interface{}, error) {
-	m.lock.RLock()
-	defer m.lock.RUnlock()
-
 	status, result, err := m.handleCall(ctx, service, function, token, reqParams.Claims, params)
 	if err != nil {
 		return status, result, err
 	}
+
 	m.metricHook(m.project, service, function)
 	return status, result, nil
 }

gateway/server/middleware.go

@@ -25,7 +25,7 @@ func loggerMiddleWare(next http.Handler) http.Handler {
 			r.Body = ioutil.NopCloser(bytes.NewBuffer(reqBody))
 		}
 
-		helpers.Logger.LogInfo(requestID, "Request", map[string]interface{}{"url": r.URL.Path, "queryVars": r.URL.Query(), "body": string(reqBody)})
+		helpers.Logger.LogInfo(requestID, "Request", map[string]interface{}{"method": r.Method, "url": r.URL.Path, "queryVars": r.URL.Query(), "body": string(reqBody)})
 		next.ServeHTTP(w, r.WithContext(helpers.CreateContext(r)))
 
 	})

runner/go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/rs/cors v1.7.0
 	github.com/segmentio/ksuid v1.0.2
-	github.com/sirupsen/logrus v1.4.2 // indirect
+	github.com/sirupsen/logrus v1.4.2
 	github.com/spaceuptech/helpers v0.1.1
 	github.com/spaceuptech/space-api-go v0.17.3
 	github.com/txn2/txeh v1.3.0

runner/server/middlware.go

@@ -25,7 +25,7 @@ func loggerMiddleWare(next http.Handler) http.Handler {
 			r.Body = ioutil.NopCloser(bytes.NewBuffer(reqBody))
 		}
 
-		helpers.Logger.LogInfo(requestID, "Request", map[string]interface{}{"url": r.URL.Path, "queryVars": r.URL.Query(), "body": string(reqBody)})
+		helpers.Logger.LogInfo(requestID, "Request", map[string]interface{}{"method": r.Method, "url": r.URL.Path, "queryVars": r.URL.Query(), "body": string(reqBody)})
 		next.ServeHTTP(w, r.WithContext(helpers.CreateContext(r)))
 
 	})

runner/server/server.go

@@ -9,6 +9,7 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/sirupsen/logrus"
 	"github.com/spaceuptech/helpers"
 
 	"github.com/spaceuptech/space-cloud/runner/metrics"
@@ -68,6 +69,10 @@ func New(c *Config) (*Server, error) {
 	debounce := utils.NewDebounce()
 
 	opts := badger.DefaultOptions("/tmp/runner.db")
+	badgerLogger := logrus.New()
+	badgerLogger.SetOutput(ioutil.Discard)
+	opts.Logger = badgerLogger
+
 	// The default logger used by badger is log, so we are disabling all the logs done by log package
 	log.SetOutput(ioutil.Discard)
 	db, err := badger.Open(opts)