Skip to content

Configurable db connection #47

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Configurable db connection #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b0e800b
db host, port and name configurable via env var
Foxite Jul 11, 2023
a4dac00
catch and log error in main async function
Foxite Jul 11, 2023
86a6117
log unexpected response in ShardAllocator
Foxite Jul 11, 2023
03655d4
update example.env with new variables
Foxite Jul 11, 2023
55cadf1
get manager host and port from env vars
Foxite Jul 11, 2023
0ab3ed3
Merge branch 'master' into configurable-db-connection
Foxite Jul 11, 2023
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 src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ if (!process.env.CLUSTERS || !process.env.CLUSTER_ID) {

// Initialize the cluster client.
cluster = new DadbotClusterClient(
{ name: "ws", options: { url: "ws://localhost:8080/manager" } },
{ name: "ws", options: { url: `ws://${process.env.MANAGER_HOST || 'localhost'}:${process.env.MANAGER_PORT || '8080'}/manager` } },
process.env.CLUSTER_MANAGER_TOKEN,
JSON.parse(await readFile("./data/schema.json", "utf-8")),
{
Expand Down Expand Up @@ -424,7 +424,7 @@ if (!process.env.CLUSTERS || !process.env.CLUSTER_ID) {

// Finally, tell the client to connect to Discord.
client.connect();
})();
})().catch(console.error);

function deathCroak(thing: string | number) {
client.disconnect(false);
Expand Down
2 changes: 1 addition & 1 deletion src/utils/ShardAllocator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export async function getShardAllocation(
json = (await response.json()) as any;

if (response.status === 429) throw new Error("Ratelimited");
if (response.status !== 200) throw new Error("Unexpected response");
if (response.status !== 200) throw new Error("Unexpected response: " + response.statusText + "\n" + response.body);

body.total = json.shards;
body.totalSessions = json.session_start_limit.total;
Expand Down