Browse Source

fix: aws timeout

Yeuoly 11 months ago
parent
commit
bbc84bc440
3 changed files with 6 additions and 6 deletions
  1. 1 3
      cmd/server/main.go
  2. 4 1
      internal/server/http_server.go
  3. 1 2
      internal/types/app/config.go

+ 1 - 3
cmd/server/main.go

@@ -1,8 +1,6 @@
 package main
 package main
 
 
 import (
 import (
-	"time"
-
 	"github.com/joho/godotenv"
 	"github.com/joho/godotenv"
 	"github.com/kelseyhightower/envconfig"
 	"github.com/kelseyhightower/envconfig"
 	"github.com/langgenius/dify-plugin-daemon/internal/server"
 	"github.com/langgenius/dify-plugin-daemon/internal/server"
@@ -43,7 +41,7 @@ func setDefault(config *app.Config) {
 	setDefaultInt(&config.PluginRemoteInstallServerEventLoopNums, 8)
 	setDefaultInt(&config.PluginRemoteInstallServerEventLoopNums, 8)
 	setDefaultInt(&config.PluginRemoteInstallingMaxConn, 128)
 	setDefaultInt(&config.PluginRemoteInstallingMaxConn, 128)
 	setDefaultInt(&config.MaxPluginPackageSize, 52428800)
 	setDefaultInt(&config.MaxPluginPackageSize, 52428800)
-	setDefaultInt(&config.MaxAWSLambdaTransactionTimeout, time.Second*150)
+	setDefaultInt(&config.MaxAWSLambdaTransactionTimeout, 150)
 	setDefaultBool(&config.PluginRemoteInstallingEnabled, true)
 	setDefaultBool(&config.PluginRemoteInstallingEnabled, true)
 	setDefaultBool(&config.PluginWebhookEnabled, true)
 	setDefaultBool(&config.PluginWebhookEnabled, true)
 	setDefaultString(&config.DBSslMode, "disable")
 	setDefaultString(&config.DBSslMode, "disable")

+ 4 - 1
internal/server/http_server.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"context"
 	"fmt"
 	"fmt"
 	"net/http"
 	"net/http"
+	"time"
 
 
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin"
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_daemon/backwards_invocation/transaction"
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_daemon/backwards_invocation/transaction"
@@ -76,7 +77,9 @@ func (app *App) webhookGroup(group *gin.RouterGroup, config *app.Config) {
 
 
 func (appRef *App) awsLambdaTransactionGroup(group *gin.RouterGroup, config *app.Config) {
 func (appRef *App) awsLambdaTransactionGroup(group *gin.RouterGroup, config *app.Config) {
 	if config.Platform == app.PLATFORM_AWS_LAMBDA {
 	if config.Platform == app.PLATFORM_AWS_LAMBDA {
-		appRef.aws_transaction_handler = transaction.NewAWSTransactionHandler(config.MaxAWSLambdaTransactionTimeout)
+		appRef.aws_transaction_handler = transaction.NewAWSTransactionHandler(
+			time.Duration(config.MaxAWSLambdaTransactionTimeout) * time.Second,
+		)
 		group.POST(
 		group.POST(
 			"/transaction",
 			"/transaction",
 			appRef.RedirectAWSLambdaTransaction,
 			appRef.RedirectAWSLambdaTransaction,

+ 1 - 2
internal/types/app/config.go

@@ -2,7 +2,6 @@ package app
 
 
 import (
 import (
 	"fmt"
 	"fmt"
-	"time"
 
 
 	"github.com/go-playground/validator/v10"
 	"github.com/go-playground/validator/v10"
 )
 )
@@ -51,7 +50,7 @@ type Config struct {
 
 
 	MaxPluginPackageSize int64 `envconfig:"MAX_PLUGIN_PACKAGE_SIZE" validate:"required"`
 	MaxPluginPackageSize int64 `envconfig:"MAX_PLUGIN_PACKAGE_SIZE" validate:"required"`
 
 
-	MaxAWSLambdaTransactionTimeout time.Duration `envconfig:"MAX_AWS_LAMBDA_TRANSACTION_TIMEOUT"`
+	MaxAWSLambdaTransactionTimeout int `envconfig:"MAX_AWS_LAMBDA_TRANSACTION_TIMEOUT"`
 }
 }
 
 
 func (c *Config) Validate() error {
 func (c *Config) Validate() error {