Skip to content

Fix: PUP_CLUSTER_PORT not set when commonPort is omitted #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hexagon merged 8 commits into from
Feb 20, 2026
Merged

Fix: PUP_CLUSTER_PORT not set when commonPort is omitted #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f65acd2
Merge pull request #63 from Hexagon/dev
Hexagon Nov 14, 2024
6268ffd
Merge pull request #64 from Hexagon/dev
Hexagon Nov 14, 2024
3746fae
Merge pull request #65 from Hexagon/dev
Hexagon Nov 19, 2024
c2beeb2
Initial plan
Copilot Feb 20, 2026
7f10dfb
Fix: Set PUP_CLUSTER_PORT when startPort is defined, regardless of co…
Copilot Feb 20, 2026
3250179
Merge branch 'dev' into copilot/identify-key-areas-for-improvement
Hexagon Feb 20, 2026
dfab675
Remove duplicated cluster port test from pup.test.ts (covered by clus…
Copilot Feb 20, 2026
dd5b980
Fix formatting: remove unnecessary parentheses in cluster.ts
Copilot Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/core/cluster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class Cluster extends Process {
modConfig.env = structuredClone(this.config.env || {})
modConfig.env.PUP_CLUSTER_INSTANCE = i.toString()

// Expose PUP_CLUSTER_PORT whenever a start port is configured
// Add PUP_CLUSTER_PORT if startPort is defined (regardless of whether the built-in load balancer is activated via commonPort)
if (this.config.cluster?.startPort !== undefined) {
modConfig.env.PUP_CLUSTER_PORT = (this.config.cluster.startPort + i).toString()
}
Expand All @@ -71,7 +71,7 @@ class Cluster extends Process {
if (this.config.cluster?.commonPort && this.config.cluster.startPort) {
backends.push({
host: "127.0.0.1",
port: (this.config.cluster.startPort + i),
port: this.config.cluster.startPort + i,
})
}
}
Expand Down
34 changes: 1 addition & 33 deletions test/core/pup.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
import type { Configuration } from "../../lib/core/configuration.ts"
import { ApiProcessState } from "@pup/api-definitions"
import { Pup } from "../../lib/core/pup.ts"
import { Cluster } from "../../lib/core/cluster.ts"
import { assert, assertEquals, assertNotEquals } from "@std/assert"
import { assertEquals, assertNotEquals } from "@std/assert"
import { test } from "@cross/test"

test("Create test process. Test start, block, stop, start, unblock, start in sequence.", async () => {
Expand Down Expand Up @@ -121,34 +120,3 @@ test("Create test cluster. Test start, block, stop, start, unblock, start in seq
// Terminate pup, allow 2.5 seconds for graceful shutdown
await pup.terminate(2500)
})

test("Cluster sets PUP_CLUSTER_PORT for each instance without common port", async () => {
const TEST_PROCESS_ID = "test-3"
const TEST_PROCESS_COMMAND = "deno run -A lib/test/core/test-data/test_process.ts"

const config: Configuration = {
processes: [
{
"id": TEST_PROCESS_ID,
"cmd": TEST_PROCESS_COMMAND,
"cluster": {
"instances": 2,
"startPort": 8000,
},
},
],
}
const pup = new Pup(config)
await pup.init()

const testProcess = pup.processes.findLast((p) => p.getConfig().id === TEST_PROCESS_ID)
assert(testProcess instanceof Cluster)

const [instance0, instance1] = testProcess.processes
assertEquals(instance0.getConfig().env?.PUP_CLUSTER_INSTANCE, "0")
assertEquals(instance0.getConfig().env?.PUP_CLUSTER_PORT, "8000")
assertEquals(instance1.getConfig().env?.PUP_CLUSTER_INSTANCE, "1")
assertEquals(instance1.getConfig().env?.PUP_CLUSTER_PORT, "8001")

await pup.terminate(2500)
})