Navy.gif/wrappers
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Navy.gif:6c72961d125dbaf1cab43294f63babf4b787b803
Branches Tags
Navy.gif:main
..
compare: Navy.gif:8a03f4e171e2c81c7b906e6e89df0deb9add206b
Branches Tags
Navy.gif:main

No commits in common. "6c72961d125dbaf1cab43294f63babf4b787b803" and "8a03f4e171e2c81c7b906e6e89df0deb9add206b" have entirely different histories.
6c72961d12 ... 8a03f4e171

2 changed files with 5 additions and 8 deletions
Show Stats Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@navy.gif/wrappers", "name": "@navy.gif/wrappers",
"version": "1.6.8", "version": "1.6.7",
"description": "Various wrapper classes I use in my projects", "description": "Various wrapper classes I use in my projects",
"repository": "https://git.corgi.wtf/Navy.gif/wrappers.git", "repository": "https://git.corgi.wtf/Navy.gif/wrappers.git",
"author": "Navy.gif", "author": "Navy.gif",

9
src/MariaDB.ts
View File

@ -24,8 +24,7 @@ export type MariaOptions = {
cluster?: PoolClusterConfig, cluster?: PoolClusterConfig,
client?: PoolConfig, client?: PoolConfig,
credentials: Credentials, credentials: Credentials,
loggerOptions?: LoggerClientOptions, loggerOptions?: LoggerClientOptions
donorQuery?: boolean
} }
type MariaError = { type MariaError = {
@ -94,7 +93,6 @@ class MariaDB
#cluster: boolean; #cluster: boolean;
#pool: PoolCluster | null; #pool: PoolCluster | null;
#nodes: Node[]; #nodes: Node[];
#canQueryDonor: boolean;
constructor (server: IServer, options: MariaOptions) constructor (server: IServer, options: MariaOptions)
{ {
@ -126,7 +124,6 @@ class MariaDB
this.#afterLastQuery = null; this.#afterLastQuery = null;
this.#cluster = this.#credentials.length > 1; this.#cluster = this.#credentials.length > 1;
this.#canQueryDonor = options.donorQuery ?? false;
this.#logger = server.createLogger(this, options.loggerOptions); this.#logger = server.createLogger(this, options.loggerOptions);
} }
@ -341,7 +338,7 @@ class MariaDB
const pool = this.#pool; const pool = this.#pool;
if (nodeName) if (nodeName)
{ {
const available = this.#nodes.filter(n => n.status === 'synced' || !n.status || (this.#canQueryDonor && n.status === 'donor')); const available = this.#nodes.filter(n => n.status === 'synced');
if (!available.length) if (!available.length)
throw new Error('No nodes available for query'); throw new Error('No nodes available for query');
const node = this.#nodes.find(n => n.name === nodeName); const node = this.#nodes.find(n => n.name === nodeName);
@ -353,7 +350,7 @@ class MariaDB
this.#logger.warn(str); this.#logger.warn(str);
nodeName = '*'; nodeName = '*';
} }
else if (node.status && node.status !== 'synced' && !(this.#canQueryDonor && node.status === 'donor')) else if (node.status && node.status !== 'synced')
{ {
const str = `Node ${nodeName} is currently not synced with the pool and thus unqueryable`; const str = `Node ${nodeName} is currently not synced with the pool and thus unqueryable`;
if (throwError) if (throwError)