diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-05-24 22:11:52 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-05-24 22:11:52 -0400 |
| commit | a4260a2cbcdfa20eea7ab45899e1427943f52082 (patch) | |
| tree | 2f267b1853b29500d07430d03a2b18447df184d9 /MediaBrowser.Server.Implementations | |
| parent | ba819f2e9503fa76c9eaec6d865263e71bf5913d (diff) | |
| parent | cc19c762b419fe427abb8d03a2625e2be796e443 (diff) | |
Merge pull request #1778 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs b/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs index 947933561..3dfc04c26 100644 --- a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs +++ b/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs @@ -28,6 +28,7 @@ namespace MediaBrowser.Server.Implementations.Devices return base.IsVisible(user) && HasChildren(); } + [IgnoreDataMember] public override string CollectionType { get { return Model.Entities.CollectionType.Photos; } diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs index 9978e9781..ec10fdaf6 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs @@ -1670,7 +1670,13 @@ namespace MediaBrowser.Server.Implementations.Persistence { var elapsed = (DateTime.UtcNow - startDate).TotalMilliseconds; - if (elapsed >= 400) + var slowThreshold = 1000; + +#if DEBUG + slowThreshold = 200; +#endif + + if (elapsed >= slowThreshold) { Logger.Debug("{2} query time (slow): {0}ms. Query: {1}", Convert.ToInt32(elapsed), |