diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-02 08:51:43 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-02 08:51:43 -0400 |
| commit | 23a4c9af21a06bb255a9db57a5a9fc84abe3a018 (patch) | |
| tree | fb2a7e4eda69c5c149c98d233b8cd66b13f639b5 /MediaBrowser.Common/Kernel/BaseKernel.cs | |
| parent | dfc12d728c6fd1d65db0ff0a3e97d79c3c14d496 (diff) | |
Uncommented ReloadConfiguration and updated GetAllUsers to return a dummy user, in order to unblock UI development.
Diffstat (limited to 'MediaBrowser.Common/Kernel/BaseKernel.cs')
| -rw-r--r-- | MediaBrowser.Common/Kernel/BaseKernel.cs | 30 |
1 files changed, 11 insertions, 19 deletions
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<TConfigurationType>(ConfigurationPath);
- //}
-
- //Logger.LoggerInstance.LogSeverity = Configuration.LogSeverity;
- }
+ // Deserialize config
+ if (!File.Exists(ApplicationPaths.ConfigurationPath))
+ {
+ Configuration = new TConfigurationType();
+ }
+ else
+ {
+ Configuration = JsonSerializer.DeserializeFromFile<TConfigurationType>(ApplicationPaths.ConfigurationPath);
+ }
- /// <summary>
- /// Saves the current application configuration to the config file
- /// </summary>
- //public void SaveConfiguration()
- //{
- // JsonSerializer.SerializeToFile(Configuration, ConfigurationPath);
- //}
+ Logger.LoggerInstance.LogSeverity = Configuration.LogSeverity;
+ }
/// <summary>
/// Restarts the Http Server, or starts it if not currently running
|