diff --git a/.env b/.env index b0a6a6cc..2b8a6a44 100755 --- a/.env +++ b/.env @@ -60,19 +60,15 @@ SHUFFLE_BASE_IMAGE_NAME=shuffle SHUFFLE_BASE_IMAGE_REGISTRY=ghcr.io SHUFFLE_BASE_IMAGE_TAG_SUFFIX="-1.1.0" -## shuffle_memcached (for distributed caching) -## shuffle_SWARM_CONFIG (run vs not run) -## shuffle_Scale_Replicas (workers/node) -## shuffle_App_Replicas (apps/node) - -SHUFFLE_SWARM_BRIDGE_DEFAULT_MTU=1500 # 1500 by default # The eth0 interface inside a container corresponds # to the virtual Ethernet interface that connects # the container to the docker0 SHUFFLE_SWARM_BRIDGE_DEFAULT_INTERFACE=eth0 +SHUFFLE_SWARM_BRIDGE_DEFAULT_MTU=1500 # 1500 by default # Used for auto-cleanup of containers. REALLY important at scale. Set to false to see all container info. SHUFFLE_CONTAINER_AUTO_CLEANUP=true +SHUFFLE_ORBORUS_EXECUTION_CONCURRENCY=3 # The amount of concurrent executions Orborus can handle. This is a soft limit, but it's recommended to keep it low. SHUFFLE_ELASTIC=true SHUFFLE_LOGS_DISABLED=false SHUFFLE_CHAT_DISABLED=false # Controls support chat diff --git a/backend/go-app/main.go b/backend/go-app/main.go index 1dac07a9..3a93a0b9 100755 --- a/backend/go-app/main.go +++ b/backend/go-app/main.go @@ -4017,7 +4017,7 @@ func runInitEs(ctx context.Context) { job := func() { err := remoteOrgJobHandler(org, interval) if err != nil { - log.Printf("[ERROR] Failed request with remote org setup for org %s (2): %s", org.Id, err) + log.Printf("[ERROR] Failed request with remote org sync for org %s (2): %s", org.Id, err) } } @@ -4719,7 +4719,7 @@ func runInit(ctx context.Context) { job := func() { err := remoteOrgJobHandler(org, interval) if err != nil { - log.Printf("[ERROR] Failed request with remote org setup (3): %s", err) + log.Printf("[ERROR] Failed request with remote org sync (3): %s", err) } } @@ -5269,7 +5269,7 @@ func handleCloudSetup(resp http.ResponseWriter, request *http.Request) { job := func() { err := remoteOrgJobHandler(*org, interval) if err != nil { - log.Printf("[ERROR] Failed request with remote org setup (1): %s", err) + log.Printf("[ERROR] Failed request with remote org sync (1): %s", err) } } diff --git a/frontend/src/components/Billing.jsx b/frontend/src/components/Billing.jsx index 0b9c484d..91f353bd 100644 --- a/frontend/src/components/Billing.jsx +++ b/frontend/src/components/Billing.jsx @@ -731,7 +731,8 @@ const Billing = (props) => { name: "Scale", limit: 0, features: [ - "Scale License. Runs faster than Open Source.", + "All Open Source features", + "Scale License. Runs faster, and across multiple servers.", "Priority Support", "Workflow & App development help", ], @@ -995,7 +996,7 @@ const Billing = (props) => { style={{ marginTop: 40, marginLeft: 10, marginBottom: 5 }} variant="h6" > - Billing Usage Overview + Shuffle Utilization - Billing (Beta) + Licensing (Beta) />