Skip to content

Commit

Permalink
fixes arkime#2961 caTrustFile not working with multies (arkime#2962)
Browse files Browse the repository at this point in the history
  • Loading branch information
awick authored Oct 16, 2024
1 parent b1aec95 commit 83a0a32
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ NOTICE: Create a parliament config file before upgrading (see https://arkime.com
## db.pl
- #2946 fix sync-files not handling multiple nodes, or dash containing nodes
correctly (thanks @dennisse)
## Multies
- #2962 fix caTrustFile not working with multies
## Viewer
- #2926 cronQueries=auto now uses the node name in the unique key
- #2935 spigraph treemap shows unique Dst/Src IPs
Expand Down
6 changes: 4 additions & 2 deletions viewer/multies.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ const ArkimeUtil = require('../common/arkimeUtil');
const ArkimeConfig = require('../common/arkimeConfig');

const esSSLOptions = { rejectUnauthorized: !ArkimeConfig.insecure };
let httpAgent;
let httpsAgent;
ArkimeConfig.loaded(() => {
const esClientKey = Config.get('esClientKey');
const esClientCert = Config.get('esClientCert');
Expand All @@ -35,6 +37,8 @@ ArkimeConfig.loaded(() => {
esSSLOptions.passphrase = esClientKeyPass;
}
}
httpAgent = new http.Agent({ keepAlive: true, keepAliveMsecs: 5000, maxSockets: 100 });
httpsAgent = new https.Agent(Object.assign({ keepAlive: true, keepAliveMsecs: 5000, maxSockets: 100 }, esSSLOptions));
});

const clients = {};
Expand All @@ -43,8 +47,6 @@ const clusters = {};
const clusterList = [];
const authHeader = {};
let activeESNodes = [];
const httpAgent = new http.Agent({ keepAlive: true, keepAliveMsecs: 5000, maxSockets: 100 });
const httpsAgent = new https.Agent(Object.assign({ keepAlive: true, keepAliveMsecs: 5000, maxSockets: 100 }, esSSLOptions));

function hasBody (req) {
const encoding = 'transfer-encoding' in req.headers;
Expand Down

0 comments on commit 83a0a32

Please sign in to comment.