Skip to content

Commit e186dfb

Browse files
committed
fixes so project start again
- but they get killed almost immediately due to all the touch's being removed
1 parent fc11fdc commit e186dfb

File tree

6 files changed

+18
-10
lines changed

6 files changed

+18
-10
lines changed

src/packages/conat/core/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ export class Client extends EventEmitter {
607607
this.state != "connected" ||
608608
this.info?.user?.error
609609
) {
610-
throw Error("failed to sign in");
610+
throw Error(`failed to sign in - ${this.info?.user?.error}`);
611611
}
612612
},
613613
);

src/packages/project-runner/run/env.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { conatServer } from "@cocalc/backend/data";
22
import { join } from "node:path";
3+
import base_path from "@cocalc/backend/base-path";
34

45
export function dataPath(HOME: string): string {
56
return join(HOME, ".cache", "cocalc");
@@ -93,6 +94,7 @@ export function getEnvironment({
9394
PATH: `${HOME}/bin:${HOME}/.local/bin:${process.env.PATH}`,
9495
CONAT_SERVER: conatServer,
9596
COCALC_SECRET_TOKEN: secretTokenPath(HOME),
97+
BASE_PATH: base_path,
9698
},
9799
};
98100
}

src/packages/project/conat/terminal-server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const logger = getLogger("project:conat:terminal-server");
1313

1414
export function init(opts) {
1515
opts = getIdentity(opts);
16-
logger.debug("init", opts);
16+
logger.debug("init");
1717
terminalServer({
1818
...opts,
1919
spawn,

src/packages/server/conat/index.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ export async function initConatChangefeedServer() {
2424
}
2525

2626
export async function initConatApi() {
27-
logger.debug("initConatApi: the central api services", { conatApiCount });
27+
logger.debug("initConatApi: the central api services", {
28+
conatApiCount,
29+
conatProjectRunnerCount,
30+
});
2831
await loadConatConfiguration();
2932

3033
// do not block on any of these!

src/packages/server/conat/project/load-balancer.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import getLogger from "@cocalc/backend/logger";
1212
import getPool from "@cocalc/database/pool";
1313
import { getProject } from "@cocalc/server/projects/control";
1414
import { type Configuration } from "@cocalc/project-runner/run";
15+
import { getProjectSecretToken } from "@cocalc/server/projects/control/secret-token";
1516

1617
const logger = getLogger("server:conat:project:load-balancer");
1718

@@ -46,12 +47,14 @@ async function getConfig({ project_id }): Promise<Configuration> {
4647
throw Error(`no project ${project_id}`);
4748
}
4849
const { run_quota } = rows[0];
49-
const config = {} as Configuration;
50-
config.cpu = `${(run_quota?.cpu_limit ?? 1) * 1000}m`;
51-
config.memory = `${run_quota?.memory ?? 1000}M`;
52-
config.pids = DEFAULT_PID_LIMIT;
53-
config.swap = "16Gi"; // no clue
54-
config.disk = `${run_quota?.disk_quota ?? 1000}M`;
50+
const config = {
51+
secret: await getProjectSecretToken(project_id),
52+
cpu: `${(run_quota?.cpu_limit ?? 1) * 1000}m`,
53+
memory: `${run_quota?.memory ?? 1000}M`,
54+
pids: DEFAULT_PID_LIMIT,
55+
swap: "16Gi", // no clue,
56+
disk: `${run_quota?.disk_quota ?? 1000}M`,
57+
} as Configuration;
5558

5659
logger.debug("config", { project_id, run_quota, config });
5760

src/packages/server/conat/project/run.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
import { loadConatConfiguration } from "../configuration";
1818
import getLogger from "@cocalc/backend/logger";
1919

20-
const logger = getLogger("server:coant:project:run");
20+
const logger = getLogger("server:conat:project:run");
2121

2222
const servers: any[] = [];
2323
export async function init(count: number = 1) {

0 commit comments

Comments
 (0)