From 23a4c9af21a06bb255a9db57a5a9fc84abe3a018 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Thu, 2 Aug 2012 08:51:43 -0400 Subject: Uncommented ReloadConfiguration and updated GetAllUsers to return a dummy user, in order to unblock UI development. --- MediaBrowser.Common/Kernel/BaseKernel.cs | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'MediaBrowser.Common/Kernel/BaseKernel.cs') diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index 2420a5091..02de6dee6 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -145,26 +145,18 @@ namespace MediaBrowser.Common.Kernel { //Configuration information for anything other than server-specific configuration will have to come via the API... -ebr - //// Deserialize config - //if (!File.Exists(ConfigurationPath)) - //{ - // Configuration = new TConfigurationType(); - //} - //else - //{ - // Configuration = JsonSerializer.DeserializeFromFile(ConfigurationPath); - //} - - //Logger.LoggerInstance.LogSeverity = Configuration.LogSeverity; - } + // Deserialize config + if (!File.Exists(ApplicationPaths.ConfigurationPath)) + { + Configuration = new TConfigurationType(); + } + else + { + Configuration = JsonSerializer.DeserializeFromFile(ApplicationPaths.ConfigurationPath); + } - /// - /// Saves the current application configuration to the config file - /// - //public void SaveConfiguration() - //{ - // JsonSerializer.SerializeToFile(Configuration, ConfigurationPath); - //} + Logger.LoggerInstance.LogSeverity = Configuration.LogSeverity; + } /// /// Restarts the Http Server, or starts it if not currently running -- cgit v1.2.3