2020-12-27 20:02:07 +00:00
diff --git a/Common/sources/constants.js b/Common/sources/constants.js
2022-05-17 13:22:05 +00:00
index 0663ead..490582a 100644
2020-12-27 20:02:07 +00:00
--- a/Common/sources/constants.js
+++ b/Common/sources/constants.js
2022-05-17 13:22:05 +00:00
@@ -75,7 +75,7 @@ exports.LICENSE_RESULT = {
2020-12-27 20:02:07 +00:00
ExpiredLimited: 11
};
-exports.LICENSE_CONNECTIONS = 20;
+exports.LICENSE_CONNECTIONS = 9999;
exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000;
2020-04-17 21:03:53 +00:00
diff --git a/Common/sources/license.js b/Common/sources/license.js
2022-05-17 13:22:05 +00:00
index c273afe..8786f62 100644
2020-04-17 21:03:53 +00:00
--- a/Common/sources/license.js
+++ b/Common/sources/license.js
2022-05-17 13:22:05 +00:00
@@ -45,20 +45,20 @@ exports.readLicense = function*() {
2020-12-27 20:02:07 +00:00
count: 1,
type: c_LR.Success,
light: false,
- packageType: constants.PACKAGE_TYPE_OS,
+ packageType: constants.PACKAGE_TYPE_I,
mode: constants.LICENSE_MODE.None,
2022-03-24 10:14:48 +00:00
- branding: false,
+ branding: true,
2020-12-27 20:02:07 +00:00
connections: constants.LICENSE_CONNECTIONS,
2020-10-18 12:36:58 +00:00
- customization: false,
2022-03-24 10:14:48 +00:00
- usersCount: 0,
2020-12-27 20:02:07 +00:00
+ customization: true,
2022-03-24 10:14:48 +00:00
+ usersCount: constants.LICENSE_CONNECTIONS,
usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
2020-04-17 21:03:53 +00:00
- hasLicense: false,
2020-04-19 11:07:33 +00:00
- plugins: false,
2020-12-27 20:02:07 +00:00
+ hasLicense: true,
+ plugins: true,
buildDate: oBuildDate,
2022-03-24 10:14:48 +00:00
startDate: startDate,
2022-05-17 13:22:05 +00:00
- endDate: null,
- customerId: ""
+ customerId: "",
2022-03-24 10:14:48 +00:00
+ endDate: new Date("2099-01-01T23:59:59.000Z")
}, null];
2020-04-17 21:03:53 +00:00
};
2021-07-02 08:07:53 +00:00
2020-12-27 20:02:07 +00:00
-exports.packageType = constants.PACKAGE_TYPE_OS;
2020-04-17 21:03:53 +00:00
+exports.packageType = constants.PACKAGE_TYPE_I;
2020-10-18 12:36:58 +00:00
diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js
2022-05-17 13:22:05 +00:00
index b654c9c..31bdf2d 100644
2020-10-18 12:36:58 +00:00
--- a/DocService/sources/DocsCoServer.js
+++ b/DocService/sources/DocsCoServer.js
2022-05-17 13:22:05 +00:00
@@ -165,7 +165,7 @@ let connections = []; // Активные соединения
2020-10-18 12:36:58 +00:00
let lockDocumentsTimerId = {};//to drop connection that can't unlockDocument
let pubsub;
let queue;
-let licenseInfo = {type: constants.LICENSE_RESULT.Error, light: false, branding: false, customization: false, plugins: false};
2022-03-24 10:14:48 +00:00
+let licenseInfo = license.readLicense().next().value[0];
let licenseOriginal = null;
2020-10-18 12:36:58 +00:00
let shutdownFlag = false;
2021-05-21 08:54:28 +00:00
let expDocumentsStep = gc.getCronStep(cfgExpDocumentsCron);
2022-05-17 13:22:05 +00:00
@@ -3328,7 +3328,7 @@ exports.install = function(server, callbackFunction) {
2020-10-18 12:36:58 +00:00
});
};
2022-03-24 10:14:48 +00:00
exports.setLicenseInfo = function(data, original ) {
2020-10-18 12:36:58 +00:00
- licenseInfo = data;
2022-03-24 10:14:48 +00:00
+ logger.debug('Not updating license info', data);
licenseOriginal = original;
2020-10-18 12:36:58 +00:00
};
exports.getLicenseInfo = function() {
diff --git a/DocService/sources/server.js b/DocService/sources/server.js
2022-05-17 13:22:05 +00:00
index ccc232b..7c4e80d 100644
2020-10-18 12:36:58 +00:00
--- a/DocService/sources/server.js
+++ b/DocService/sources/server.js
2022-05-17 13:22:05 +00:00
@@ -147,7 +147,6 @@ try {
2020-10-18 12:36:58 +00:00
} catch (e) {
logger.warn('Failed to subscribe to plugin folder updates. When changing the list of plugins, you must restart the server. https://nodejs.org/docs/latest/api/fs.html#fs_availability');
}
-fs.watchFile(configCommon.get('license').get('license_file'), updateLicense);
setInterval(updateLicense, 86400000);
// Если захочется использовать 'development' и 'production',
diff --git a/FileConverter/sources/convertermaster.js b/FileConverter/sources/convertermaster.js
2022-03-24 10:14:48 +00:00
index 2c4526f..ec07464 100644
2020-10-18 12:36:58 +00:00
--- a/FileConverter/sources/convertermaster.js
+++ b/FileConverter/sources/convertermaster.js
@@ -85,7 +85,6 @@ if (cluster.isMaster) {
updateLicense();
- fs.watchFile(configCommon.get('license').get('license_file'), updateLicense);
setInterval(updateLicense, 86400000);
} else {
const converter = require('./converter');
2020-04-17 21:03:53 +00:00
diff --git a/Makefile b/Makefile
2022-03-24 10:14:48 +00:00
index e8e1308..23f7e2e 100644
2020-04-17 21:03:53 +00:00
--- a/Makefile
+++ b/Makefile
2022-03-24 10:14:48 +00:00
@@ -87,7 +87,7 @@ DEBUG = $(BRANDING_DIR)/debug.js
2020-04-17 21:03:53 +00:00
.PHONY: all clean install uninstall build-date
.NOTPARALLEL:
2022-03-24 10:14:48 +00:00
-all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(DOCUMENT_TEMPLATES) $(LICENSE) $(WELCOME) $(INFO) build-date
2020-10-18 12:36:58 +00:00
+all: $(SCHEMA) $(LICENSE) $(WELCOME) $(INFO) build-date
2020-04-17 21:03:53 +00:00
build-date: $(GRUNT_FILES)
sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS)