Merge pull request #3188 from chakflying/fix/radius-timeout

Fix: Set radius connection timeout to monitor default
This commit is contained in:
Louis Lam 2023-07-09 22:47:39 +08:00 committed by GitHub
commit d825dbf828
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions

View file

@ -740,7 +740,8 @@ class Monitor extends BeanModel {
this.radiusCalledStationId, this.radiusCalledStationId,
this.radiusCallingStationId, this.radiusCallingStationId,
this.radiusSecret, this.radiusSecret,
port port,
this.interval * 1000 * 0.8,
); );
if (resp.code) { if (resp.code) {
bean.msg = resp.code; bean.msg = resp.code;

View file

@ -378,6 +378,7 @@ exports.mongodbPing = async function (connectionString) {
* @param {string} callingStationId ID of calling station * @param {string} callingStationId ID of calling station
* @param {string} secret Secret to use * @param {string} secret Secret to use
* @param {number} [port=1812] Port to contact radius server on * @param {number} [port=1812] Port to contact radius server on
* @param {number} [timeout=2500] Timeout for connection to use
* @returns {Promise<any>} * @returns {Promise<any>}
*/ */
exports.radius = function ( exports.radius = function (
@ -388,10 +389,12 @@ exports.radius = function (
callingStationId, callingStationId,
secret, secret,
port = 1812, port = 1812,
timeout = 2500,
) { ) {
const client = new radiusClient({ const client = new radiusClient({
host: hostname, host: hostname,
hostPort: port, hostPort: port,
timeout: timeout,
dictionaries: [ file ], dictionaries: [ file ],
}); });