add serverId to the log

MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs

@@ -66,7 +66,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         {
             try
             {
-                await new UsageReporter(_applicationHost, _httpClient, _userManager)
+                await new UsageReporter(_applicationHost, _httpClient, _userManager, _logger)
                     .ReportAppUsage(client, CancellationToken.None)
                     .ConfigureAwait(false);
             }
@@ -108,7 +108,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         {
             try
             {
-                await new UsageReporter(_applicationHost, _httpClient, _userManager)
+                await new UsageReporter(_applicationHost, _httpClient, _userManager, _logger)
                     .ReportServerUsage(CancellationToken.None)
                     .ConfigureAwait(false);
             }

MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs

@@ -8,6 +8,7 @@ using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Logging;
 
 namespace MediaBrowser.Server.Implementations.EntryPoints
 {
@@ -16,13 +17,15 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         private readonly IApplicationHost _applicationHost;
         private readonly IHttpClient _httpClient;
         private readonly IUserManager _userManager;
+        private readonly ILogger _logger;
         private const string MbAdminUrl = "http://www.mb3admin.com/admin/";
 
-        public UsageReporter(IApplicationHost applicationHost, IHttpClient httpClient, IUserManager userManager)
+        public UsageReporter(IApplicationHost applicationHost, IHttpClient httpClient, IUserManager userManager, ILogger logger)
         {
             _applicationHost = applicationHost;
             _httpClient = httpClient;
             _userManager = userManager;
+            _logger = logger;
         }
 
         public Task ReportServerUsage(CancellationToken cancellationToken)
@@ -47,7 +50,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             data["linkedusers"] = users.Count(i => i.ConnectLinkType.HasValue && i.ConnectLinkType.Value == UserLinkType.LinkedUser).ToString(CultureInfo.InvariantCulture);
 
             data["plugins"] = string.Join(",", _applicationHost.Plugins.Select(i => i.Id).ToArray());
-            
+
             return _httpClient.Post(MbAdminUrl + "service/registration/ping", data, cancellationToken);
         }
 
@@ -58,6 +61,12 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
                 throw new ArgumentException("Client info must have a device Id");
             }
 
+            _logger.Info("App Activity: app: {0}, version: {1}, deviceId: {2}, deviceName: {3}",
+                app.AppName ?? "Unknown App",
+                app.AppVersion ?? "Unknown",
+                app.DeviceId,
+                app.DeviceName ?? "Unknown");
+
             cancellationToken.ThrowIfCancellationRequested();
 
             var data = new Dictionary<string, string>

MediaBrowser.Server.Startup.Common/ApplicationHost.cs

@@ -321,6 +321,7 @@ namespace MediaBrowser.Server.Startup.Common
         {
             await base.RunStartupTasks().ConfigureAwait(false);
 
+            Logger.Info("ServerId: {0}", SystemId);
             Logger.Info("Core startup complete");
             HttpServer.GlobalResponse = null;