Skip to content

Fix wait redis #77

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

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

Fix wait redis #77

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
341c4c5
remove redis lib
nh758 Sep 9, 2025
d4ff0e0
Clean up logs
nh758 Sep 11, 2025
21000db
skip wait for redis host 'redis'
nh758 Sep 11, 2025
fc2024f
Merge branch 'master' of github.com:CruGlobal/ab-utils into nh/fix-wa…
pong-promrat Feb 2, 2026
e163c3d
+add MySQL connection pool max size config
pong-promrat Feb 4, 2026
d8a950d
*Fix "Tarn: opt.max must be an integer > 0" error
pong-promrat Feb 4, 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
79 changes: 41 additions & 38 deletions utils/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const Mysql = require("mysql");
const path = require("path");
// const prettyTime = require("pretty-time");

const redis = require("redis");
// const redis = require("redis");

// var _ = require("lodash");
const EventEmitter = require("events").EventEmitter;
Expand Down Expand Up @@ -726,43 +726,46 @@ class ABServiceController extends EventEmitter {
* @return {Promise}
*/
_waitForRedis() {
return new Promise((resolve /* , reject */) => {
var client = redis.createClient({
host: "redis",
// port: <port>,
// password: '<password>'

retry_strategy: function (options) {
// if (options.error && options.error.code === "ECONNREFUSED") {
// // End reconnecting on a specific error and flush all commands with
// // a individual error
// return new Error("The server refused the connection");
// }
// if (options.total_retry_time > 1000 * 60 * 60) {
// // End reconnecting after a specific timeout and flush all commands
// // with a individual error
// return new Error("Retry time exhausted");
// }
// if (options.attempt > 10) {
// // End reconnecting with built in error
// return undefined;
// }

// console.log("... waiting for redis attempt:" + options.attempt);
// reconnect after
return Math.min(options.attempt * 200, 3000);
},
});

// client.on("error", (err) => {
// console.log("... waiting for redis");
// });

client.on("connect", () => {
client.quit();
resolve();
});
});
// Can't have a hard coded host for ecs. Is this even necessary, I think
// cote can handle
return new Promise((r) => r());
// return new Promise((resolve /* , reject */) => {
// var client = redis.createClient({
// host: "redis",
// // port: <port>,
// // password: '<password>'
//
// retry_strategy: function (options) {
// // if (options.error && options.error.code === "ECONNREFUSED") {
// // // End reconnecting on a specific error and flush all commands with
// // // a individual error
// // return new Error("The server refused the connection");
// // }
// // if (options.total_retry_time > 1000 * 60 * 60) {
// // // End reconnecting after a specific timeout and flush all commands
// // // with a individual error
// // return new Error("Retry time exhausted");
// // }
// // if (options.attempt > 10) {
// // // End reconnecting with built in error
// // return undefined;
// // }
//
// // console.log("... waiting for redis attempt:" + options.attempt);
// // reconnect after
// return Math.min(options.attempt * 200, 3000);
// },
// });
//
// // client.on("error", (err) => {
// // console.log("... waiting for redis");
// // });
//
// client.on("connect", () => {
// client.quit();
// resolve();
// });
// });
}
}

Expand Down
14 changes: 11 additions & 3 deletions utils/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ function env(envKey, defaultValue) {
if (typeof process.env[envKey] == "undefined" || process.env[envKey] == "") {
return defaultValue;
}
if (envKey.startsWith("MYSQL_")) return process.env[envKey];
try {
return JSON.parse(process.env[envKey]);
} catch (e) {
Expand All @@ -24,14 +25,15 @@ function env(envKey, defaultValue) {
let expectedValues = ["http"];
let isExpected = false;
expectedValues.forEach((v) => {
if (process.env[envKey].indexOf("http") != -1) {
if (process.env[envKey].indexOf(v) != -1) {
isExpected = true;
}
});
if (!isExpected) {
// let's report this just in case:
console.log(e);
console.log(`process.env[${envKey}]=[${process.env[envKey]}]`);
console.log(
`Failed to parse process.env[${envKey}]=[${process.env[envKey]}] as JSON, is this expected?`,
);
}

return process.env[envKey];
Expand All @@ -49,6 +51,9 @@ module.exports = {
user: env("MYSQL_USER", "root"),
password: process.env.MYSQL_PASSWORD,
database: env("MYSQL_DBPREFIX", "appbuilder"),
poolMax: env("MYSQL_POOL_MAX")
? parseInt(env("MYSQL_POOL_MAX"))
: undefined,
},
site: {
adapter: "sails-mysql",
Expand All @@ -57,6 +62,9 @@ module.exports = {
user: env("MYSQL_USER", "root"),
password: process.env.MYSQL_PASSWORD,
database: env("MYSQL_DBADMIN", "appbuilder-admin"),
poolMax: env("MYSQL_POOL_MAX")
? parseInt(env("MYSQL_POOL_MAX"))
: undefined,
},
};
},
Expand Down
Loading