aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-11-20 16:02:32 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-11-20 16:02:32 -0500
commit94e622e3a0cfcd14ad47ede3342dfab7a862c4d9 (patch)
treef7168a0f626ab59dd931b47b70bcd27d554af6d7 /src
parent6da99d9d04042a461ec04e57b6e40708a37bb44f (diff)
add sqlite logging
Diffstat (limited to 'src')
-rw-r--r--src/Emby.Server/CoreAppHost.cs7
-rw-r--r--src/Emby.Server/Data/DbConnector.cs52
-rw-r--r--src/Emby.Server/Program.cs3
3 files changed, 3 insertions, 59 deletions
diff --git a/src/Emby.Server/CoreAppHost.cs b/src/Emby.Server/CoreAppHost.cs
index 21f6ae445..5291f20ef 100644
--- a/src/Emby.Server/CoreAppHost.cs
+++ b/src/Emby.Server/CoreAppHost.cs
@@ -4,12 +4,12 @@ using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using Emby.Server.Core;
-using Emby.Server.Core.Data;
using Emby.Server.Core.FFMpeg;
using Emby.Server.Data;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.System;
+using Emby.Server.Implementations;
namespace Emby.Server
{
@@ -55,11 +55,6 @@ namespace Emby.Server
{
}
- protected override IDbConnector GetDbConnector()
- {
- return new DbConnector(Logger);
- }
-
protected override void ConfigureAutoRunInternal(bool autorun)
{
}
diff --git a/src/Emby.Server/Data/DbConnector.cs b/src/Emby.Server/Data/DbConnector.cs
deleted file mode 100644
index bd70cff6c..000000000
--- a/src/Emby.Server/Data/DbConnector.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Data;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Logging;
-using Emby.Server.Core.Data;
-using Microsoft.Data.Sqlite;
-
-namespace Emby.Server.Data
-{
- public class DbConnector : IDbConnector
- {
- private readonly ILogger _logger;
-
- public DbConnector(ILogger logger)
- {
- _logger = logger;
- }
-
- public async Task<IDbConnection> Connect(string dbPath, bool isReadOnly, bool enablePooling = false, int? cacheSize = null)
- {
- if (string.IsNullOrEmpty(dbPath))
- {
- throw new ArgumentNullException("dbPath");
- }
-
- //SQLiteConnection.SetMemoryStatus(false);
-
- var connectionstr = new SqliteConnectionStringBuilder
- {
- //PageSize = 4096,
- //CacheSize = cacheSize ?? 2000,
- //SyncMode = SynchronizationModes.Normal,
- DataSource = dbPath,
- //JournalMode = SQLiteJournalModeEnum.Wal,
-
- // This is causing crashing under linux
- //Pooling = enablePooling && Environment.OSVersion.Platform == PlatformID.Win32NT,
- //ReadOnly = isReadOnly,
- Cache = enablePooling ? SqliteCacheMode.Default : SqliteCacheMode.Private,
- Mode = isReadOnly ? SqliteOpenMode.ReadOnly : SqliteOpenMode.ReadWriteCreate
- };
-
- var connectionString = connectionstr.ConnectionString;
-
- var connection = new SqliteConnection(connectionString);
-
- await connection.OpenAsync().ConfigureAwait(false);
-
- return connection;
- }
- }
-} \ No newline at end of file
diff --git a/src/Emby.Server/Program.cs b/src/Emby.Server/Program.cs
index 80e56c8ab..e5d8351fe 100644
--- a/src/Emby.Server/Program.cs
+++ b/src/Emby.Server/Program.cs
@@ -15,10 +15,11 @@ using Emby.Common.Implementations.Logging;
using Emby.Common.Implementations.Networking;
using Emby.Drawing;
using Emby.Server.Core;
-using Emby.Server.Core.Browser;
+using Emby.Server.Implementations.Browser;
using Emby.Server.Implementations.IO;
using MediaBrowser.Common.Net;
using Emby.Server.IO;
+using Emby.Server.Implementations;
namespace Emby.Server
{