Skip to content

Commit f4a36b7

Browse files
committed
Merge remote-tracking branch 'origin/master' into cocalc-api-20250927
2 parents 057477c + 563f384 commit f4a36b7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+607
-1472
lines changed

src/compute/compute/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"references": [
99
{ "path": "../api-client" },
1010
{ "path": "../backend" },
11+
{ "path": "../conat" },
1112
{ "path": "../jupyter" },
1213
{ "path": "../project" },
1314
{ "path": "../sync" },

src/compute/pnpm-lock.yaml

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"make": "pnpm run build",
77
"make-dev": "pnpm run build-dev",
88
"build": "./workspaces.py install && ./workspaces.py build && pnpm python-api",
9+
"tsc-all": "./workspaces.py tsc --parallel",
910
"build-dev": "./workspaces.py install && ./workspaces.py build --dev && pnpm python-api",
1011
"clean": "rm -rf packages/node_modules && ./workspaces.py clean && cd compute/compute && pnpm clean ",
1112
"hub": "cd packages/hub && npm run hub-project-dev-nobuild",

src/packages/backend/conat/persist.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,21 @@ export { pstream } from "@cocalc/conat/persist/storage";
3030
import { server } from "@cocalc/conat/persist/server";
3131
export { server };
3232
import { conat } from "./conat";
33+
export { initLoadBalancer } from "@cocalc/conat/persist/load-balancer";
3334

3435
const persistServers: any[] = [];
3536

36-
export function initPersistServer() {
37+
export function initPersistServer({
38+
id,
39+
clusterMode,
40+
}: {
41+
id?: string;
42+
clusterMode?: boolean;
43+
}) {
3744
const persistServer = server({
3845
client: conat({ noCache: persistServers.length > 0 }),
46+
id,
47+
clusterMode,
3948
});
4049
persistServers.push(persistServer);
4150
}

src/packages/backend/conat/test/cluster/cluster-sticky-state.test.ts

Lines changed: 0 additions & 193 deletions
This file was deleted.

src/packages/backend/conat/test/cluster/cluster-sticky.test.ts

Lines changed: 0 additions & 119 deletions
This file was deleted.

0 commit comments

Comments
 (0)