From d39f8a11614de8850de9a9b433c1a4f190ccadc9 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 29 Jan 2014 19:18:05 -0500 Subject: Added is running as service to IServerApplicationHost --- MediaBrowser.ServerApplication/ApplicationHost.cs | 13 ++++++++++--- MediaBrowser.ServerApplication/MainStartup.cs | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'MediaBrowser.ServerApplication') diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index 4b15ca8d03..91019c0a89 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -179,10 +179,16 @@ namespace MediaBrowser.ServerApplication /// /// The application paths. /// The log manager. - public ApplicationHost(ServerApplicationPaths applicationPaths, ILogManager logManager) + public ApplicationHost(ServerApplicationPaths applicationPaths, ILogManager logManager, bool isRunningAsService) : base(applicationPaths, logManager) { + _isRunningAsService = isRunningAsService; + } + private readonly bool _isRunningAsService; + public bool IsRunningAsService + { + get { return _isRunningAsService; } } /// @@ -431,7 +437,7 @@ namespace MediaBrowser.ServerApplication await ItemRepository.Initialize().ConfigureAwait(false); await ProviderRepository.Initialize().ConfigureAwait(false); - + ((LibraryManager)LibraryManager).ItemRepository = ItemRepository; } @@ -687,7 +693,8 @@ namespace MediaBrowser.ServerApplication WanAddress = GetWanAddress(), HasUpdateAvailable = _hasUpdateAvailable, SupportsAutoRunAtStartup = SupportsAutoRunAtStartup, - TranscodingTempPath = ApplicationPaths.TranscodingTempPath + TranscodingTempPath = ApplicationPaths.TranscodingTempPath, + IsRunningAsService = IsRunningAsService }; } diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs index 3021363213..f34c3921d9 100644 --- a/MediaBrowser.ServerApplication/MainStartup.cs +++ b/MediaBrowser.ServerApplication/MainStartup.cs @@ -212,7 +212,7 @@ namespace MediaBrowser.ServerApplication SystemEvents.SessionEnding += SystemEvents_SessionEnding; SystemEvents.SessionSwitch += SystemEvents_SessionSwitch; - _appHost = new ApplicationHost(appPaths, logManager); + _appHost = new ApplicationHost(appPaths, logManager, runService); _app = new App(_appHost, _appHost.LogManager.GetLogger("App"), runService); -- cgit v1.2.3 From 1f6918117c2a7542e066ffb5ac09051a698bb136 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 29 Jan 2014 19:22:59 -0500 Subject: Added isservice to reported statistics --- .../BaseApplicationHost.cs | 6 ++++++ .../ScheduledTasks/Tasks/StatisticsTask.cs | 17 ++++++++++++----- MediaBrowser.Common/IApplicationHost.cs | 6 ++++++ MediaBrowser.Controller/IServerApplicationHost.cs | 6 ------ MediaBrowser.ServerApplication/ApplicationHost.cs | 2 +- 5 files changed, 25 insertions(+), 12 deletions(-) (limited to 'MediaBrowser.ServerApplication') diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs index 506774b4a5..e2ef4864d0 100644 --- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs +++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs @@ -171,6 +171,12 @@ namespace MediaBrowser.Common.Implementations /// The name. public abstract string Name { get; } + /// + /// Gets a value indicating whether this instance is running as service. + /// + /// true if this instance is running as service; otherwise, false. + public abstract bool IsRunningAsService { get; } + /// /// Initializes a new instance of the class. /// diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/StatisticsTask.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/StatisticsTask.cs index 46f3fd4a9f..9c0fe165d4 100644 --- a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/StatisticsTask.cs +++ b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/StatisticsTask.cs @@ -1,6 +1,4 @@ -using System.Reflection; -using MediaBrowser.Common.Configuration; -using MediaBrowser.Common.Net; +using MediaBrowser.Common.Net; using MediaBrowser.Common.ScheduledTasks; using MediaBrowser.Model.Logging; using System; @@ -74,7 +72,16 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks progress.Report(0); var mac = NetworkManager.GetMacAddress(); - var data = new Dictionary { { "feature", ApplicationHost.Name }, { "mac", mac }, { "ver", ApplicationHost.ApplicationVersion.ToString() }, { "platform", Environment.OSVersion.VersionString } }; + + var data = new Dictionary + { + { "feature", ApplicationHost.Name }, + { "mac", mac }, + { "ver", ApplicationHost.ApplicationVersion.ToString() }, + { "platform", Environment.OSVersion.VersionString }, + { "isservice", ApplicationHost.IsRunningAsService.ToString().ToLower()} + }; + await HttpClient.Post(Constants.Constants.MbAdminUrl + "service/registration/ping", data, CancellationToken.None).ConfigureAwait(false); progress.Report(100); @@ -86,7 +93,7 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks /// The name. public string Name { - get { return "Collect stats"; } + get { return "Collect anonymous usage stats"; } } /// diff --git a/MediaBrowser.Common/IApplicationHost.cs b/MediaBrowser.Common/IApplicationHost.cs index 8cd1252c74..3d5f3c96f9 100644 --- a/MediaBrowser.Common/IApplicationHost.cs +++ b/MediaBrowser.Common/IApplicationHost.cs @@ -24,6 +24,12 @@ namespace MediaBrowser.Common /// event EventHandler> ApplicationUpdated; + /// + /// Gets a value indicating whether this instance is running as service. + /// + /// true if this instance is running as service; otherwise, false. + bool IsRunningAsService { get; } + /// /// Gets or sets a value indicating whether this instance has pending kernel reload. /// diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs index 38a3cc9236..5554ced376 100644 --- a/MediaBrowser.Controller/IServerApplicationHost.cs +++ b/MediaBrowser.Controller/IServerApplicationHost.cs @@ -20,12 +20,6 @@ namespace MediaBrowser.Controller /// The name of the web application. string WebApplicationName { get; } - /// - /// Gets a value indicating whether this instance is running as service. - /// - /// true if this instance is running as service; otherwise, false. - bool IsRunningAsService { get; } - /// /// Gets a value indicating whether [supports automatic run at startup]. /// diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index 91019c0a89..0609e80ef9 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -186,7 +186,7 @@ namespace MediaBrowser.ServerApplication } private readonly bool _isRunningAsService; - public bool IsRunningAsService + public override bool IsRunningAsService { get { return _isRunningAsService; } } -- cgit v1.2.3