Merge pull request #1095 from mountaindude/master

fix(qs-license): Correct license type names written to InfluxDB when …
ptarmiganlabs · Apr 17, 2024 · 95b0d9f · 95b0d9f
2 parents 9c70e56 + 1cd59f2
commit 95b0d9f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/lib/qliksense_license.js b/src/lib/qliksense_license.js
@@ -92,7 +92,7 @@ async function licenseReleaseProfessional(config, logger, qrsInstance, neverRele
             // If the user is not in the neverReleaseUsers array, and the days since last use is greater than the release threshold, release the license
             if (
                 !doNotRelease &&
-                daysSinceLastUse > config.get('Butler.qlikSenseLicense.licenseRelease.licenseType.professional.releaseThresholdDays')
+                daysSinceLastUse >= config.get('Butler.qlikSenseLicense.licenseRelease.licenseType.professional.releaseThresholdDays')
             ) {
                 releaseProfessional.push({
                     licenseId: license.id,
@@ -131,7 +131,7 @@ async function licenseReleaseProfessional(config, logger, qrsInstance, neverRele
         ) {
             // eslint-disable-next-line no-await-in-loop
             await postQlikSenseLicenseReleasedToInfluxDB({
-                licenseType: 'professional_access',
+                licenseType: 'professional',
                 licenseId: licenseRelease.licenseId,
                 userDir: licenseRelease.userDir,
                 userId: licenseRelease.userId,
@@ -181,7 +181,7 @@ async function licenseReleaseAnalyzer(config, logger, qrsInstance, neverReleaseU
             // If the user is not in the neverReleaseUsers array, and the days since last use is greater than the release threshold, release the license
             if (
                 !doNotRelease &&
-                daysSinceLastUse > config.get('Butler.qlikSenseLicense.licenseRelease.licenseType.analyzer.releaseThresholdDays')
+                daysSinceLastUse >= config.get('Butler.qlikSenseLicense.licenseRelease.licenseType.analyzer.releaseThresholdDays')
             ) {
                 releaseAnalyzer.push({
                     licenseId: license.id,
@@ -220,7 +220,7 @@ async function licenseReleaseAnalyzer(config, logger, qrsInstance, neverReleaseU
         ) {
             // eslint-disable-next-line no-await-in-loop
             await postQlikSenseLicenseReleasedToInfluxDB({
-                licenseType: 'analyzer_access',
+                licenseType: 'analyzer',
                 licenseId: licenseRelease.licenseId,
                 userDir: licenseRelease.userDir,
                 userId: licenseRelease.userId,