admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2022-09-15 20:31:08 +00:00
parent 07873339c8
commit cbc9916eb8
3 changed files with 43 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/AyaNova/Program.cs
View File

@@ -259,8 +259,13 @@ namespace AyaNova
logger.Info(".Net Version - {0}", Environment.Version.ToString());
logger.Debug("CPU count - {0}", Environment.ProcessorCount);
logger.Debug("RAM - {0}", FileUtil.GetBytesReadable(GC.GetGCMemoryInfo().TotalAvailableMemoryBytes));
#if (SUBSCRIPTION_BUILD)
logger.Debug("Available data storage - {0}", FileUtil.GetBytesReadable(AttachmentFilesAvailableSpace));
#else
logger.Debug("Backup file space - {0}", FileUtil.GetBytesReadable(UtilityFilesAvailableSpace));
logger.Debug("Attachments file space - {0}", FileUtil.GetBytesReadable(AttachmentFilesAvailableSpace));
#endif
ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("Boot path", startFolder);
ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("OS", Environment.OSVersion.ToString());
@@ -274,8 +279,12 @@ namespace AyaNova
ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("OS Locale", System.Globalization.CultureInfo.CurrentCulture.EnglishName);
ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("RAM", FileUtil.GetBytesReadable(GC.GetGCMemoryInfo().TotalAvailableMemoryBytes));
#if (SUBSCRIPTION_BUILD)
ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("Available data storage", FileUtil.GetBytesReadable(AttachmentFilesAvailableSpace));
#else
ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("Backup space", FileUtil.GetBytesReadable(UtilityFilesAvailableSpace));
ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("Attachments space", FileUtil.GetBytesReadable(AttachmentFilesAvailableSpace));
#endif

14
server/AyaNova/util/License.cs
View File

@@ -68,10 +68,6 @@ namespace AyaNova.Core
//ActiveCustomerUsers subscription license
private const string ACTIVE_CUSTOMER_USERS_FEATURE_NAME = "ActiveCustomerUsers";
//Subscription maximum data folder size (includes db and all files created by AyaNova or attached etc)
private const string MAXIMUM_DATA_GB_FEATURE_NAME = "MaximumDataGB";
private const int DEFAULT_MAXIMUM_DATA_GB = 20;
//This feature name means it's a trial key
private const string TRIAL_FEATURE_NAME = "TrialMode";
@@ -164,14 +160,6 @@ namespace AyaNova.Core
}
}
public long MaxiumDataGB
{
get
{
return GetLicenseFeature(MAXIMUM_DATA_GB_FEATURE_NAME)?.Count ?? DEFAULT_MAXIMUM_DATA_GB;
}
}
/// <summary>
/// Check for the existance of license feature
/// </summary>
@@ -430,7 +418,7 @@ namespace AyaNova.Core
#else
build = "Perpetual",
#endif
// activeTechUserCount = AyaNova.Biz.UserBiz.ActiveTechUserCountAsync().Result,
// activeTechUserCount = AyaNova.Biz.UserBiz.ActiveTechUserCountAsync().Result,
activeCustomerContactUserCount = AyaNova.Biz.UserBiz.ActiveCustomerContactUserCountAsync().Result,
activeInternalUserCount = AyaNova.Biz.UserBiz.ActiveInternalUserCountAsync().Result
}