Skip to content

Commit ed4976a

Browse files
committed
Humanize folder size.
1 parent 8805ba5 commit ed4976a

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

src/ServiceControl.Audit/Infrastructure/Bootstrapper.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ namespace ServiceControl.Audit.Infrastructure
33
using System;
44
using System.Collections.Concurrent;
55
using System.Diagnostics;
6+
using System.Globalization;
67
using System.IO;
78
using System.Linq;
89
using System.Net;
@@ -16,6 +17,7 @@ namespace ServiceControl.Audit.Infrastructure
1617
using Autofac;
1718
using Autofac.Core.Activators.Reflection;
1819
using Autofac.Features.ResolveAnything;
20+
using Humanizer;
1921
using Microsoft.Owin.Hosting;
2022
using Monitoring;
2123
using NServiceBus;
@@ -201,13 +203,15 @@ static long DirSize(DirectoryInfo d)
201203
void RecordStartup(LoggingSettings loggingSettings, EndpointConfiguration endpointConfiguration)
202204
{
203205
var version = FileVersionInfo.GetVersionInfo(typeof(Bootstrapper).Assembly.Location).ProductVersion;
206+
var dataSize = DataSize();
207+
var folderSize = FolderSize();
204208
var startupMessage = $@"
205209
-------------------------------------------------------------
206210
ServiceControl Audit Version: {version}
207211
Audit Retention Period: {settings.AuditRetentionPeriod}
208212
Forwarding Audit Messages: {settings.ForwardAuditMessages}
209-
Database Size: {DataSize():n0} bytes
210-
Database Folder Size: {FolderSize():n0} bytes
213+
Database Size: {dataSize:n0} bytes ({dataSize.Bytes().ToString("#.##", CultureInfo.InvariantCulture)})
214+
Database Folder Size: {folderSize:n0} bytes ({folderSize.Bytes().ToString("#.##", CultureInfo.InvariantCulture)})
211215
ServiceControl Logging Level: {loggingSettings.LoggingLevel}
212216
RavenDB Logging Level: {loggingSettings.RavenDBLogLevel}
213217
Selected Transport Customization: {settings.TransportCustomizationType}

src/ServiceControl.SagaAudit/ServiceControl.SagaAudit.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8+
<PackageReference Include="Humanizer.Core" Version="2.8.26" />
89
<PackageReference Include="NServiceBus" Version="7.4.6" />
910
</ItemGroup>
1011

src/ServiceControl/Bootstrapper.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ namespace Particular.ServiceControl
33
using System;
44
using System.Collections.Concurrent;
55
using System.Diagnostics;
6+
using System.Globalization;
67
using System.IO;
78
using System.Linq;
89
using System.Net;
@@ -22,6 +23,7 @@ namespace Particular.ServiceControl
2223
using global::ServiceControl.Operations;
2324
using global::ServiceControl.Recoverability;
2425
using global::ServiceControl.Transports;
26+
using Humanizer;
2527
using Microsoft.Owin.Hosting;
2628
using NServiceBus;
2729
using NServiceBus.Configuration.AdvancedExtensibility;
@@ -215,15 +217,17 @@ static long DirSize(DirectoryInfo d)
215217
void RecordStartup(LoggingSettings loggingSettings, EndpointConfiguration endpointConfiguration)
216218
{
217219
var version = FileVersionInfo.GetVersionInfo(typeof(Bootstrapper).Assembly.Location).ProductVersion;
220+
var dataSize = DataSize();
221+
var folderSize = FolderSize();
218222
var startupMessage = $@"
219223
-------------------------------------------------------------
220224
ServiceControl Version: {version}
221225
Audit Retention Period (optional): {settings.AuditRetentionPeriod}
222226
Error Retention Period: {settings.ErrorRetentionPeriod}
223227
Ingest Error Messages: {settings.IngestErrorMessages}
224228
Forwarding Error Messages: {settings.ForwardErrorMessages}
225-
Database Size: {DataSize():n0} bytes
226-
Database Folder Size: {FolderSize():n0} bytes
229+
Database Size: {dataSize:n0} bytes ({dataSize.Bytes().ToString("#.##", CultureInfo.InvariantCulture)})
230+
Database Folder Size: {folderSize:n0} bytes ({folderSize.Bytes().ToString("#.##", CultureInfo.InvariantCulture)})
227231
ServiceControl Logging Level: {loggingSettings.LoggingLevel}
228232
RavenDB Logging Level: {loggingSettings.RavenDBLogLevel}
229233
Selected Transport Customization: {settings.TransportCustomizationType}

src/ServiceControl/ServiceControl.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24+
<PackageReference Include="Humanizer.Core" Version="2.8.26" />
2425
<PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.7" />
2526
<PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.7" />
2627
<PackageReference Include="Autofac.WebApi2" Version="4.3.1" />

0 commit comments

Comments
 (0)