Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
CAP
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tsai
CAP
Commits
73438646
Commit
73438646
authored
Nov 22, 2019
by
Savorboard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix SqlServer service injection bug
parent
71df4dfd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
9 deletions
+37
-9
CAP.SqlServerCapOptionsExtension.cs
...NetCore.CAP.SqlServer/CAP.SqlServerCapOptionsExtension.cs
+3
-0
IProcessingServer.DiagnosticRegister.cs
...erver/Diagnostics/IProcessingServer.DiagnosticRegister.cs
+33
-0
IStorageInitializer.SqlServer.cs
...DotNetCore.CAP.SqlServer/IStorageInitializer.SqlServer.cs
+1
-9
No files found.
src/DotNetCore.CAP.SqlServer/CAP.SqlServerCapOptionsExtension.cs
View file @
73438646
...
@@ -2,10 +2,12 @@
...
@@ -2,10 +2,12 @@
// Licensed under the MIT License. See License.txt in the project root for license information.
// Licensed under the MIT License. See License.txt in the project root for license information.
using
System
;
using
System
;
using
DotNetCore.CAP.Internal
;
using
DotNetCore.CAP.Persistence
;
using
DotNetCore.CAP.Persistence
;
using
DotNetCore.CAP.SqlServer
;
using
DotNetCore.CAP.SqlServer
;
using
DotNetCore.CAP.SqlServer.Diagnostics
;
using
DotNetCore.CAP.SqlServer.Diagnostics
;
using
Microsoft.Extensions.DependencyInjection
;
using
Microsoft.Extensions.DependencyInjection
;
using
Microsoft.Extensions.DependencyInjection.Extensions
;
using
Microsoft.Extensions.Options
;
using
Microsoft.Extensions.Options
;
// ReSharper disable once CheckNamespace
// ReSharper disable once CheckNamespace
...
@@ -28,6 +30,7 @@ namespace DotNetCore.CAP
...
@@ -28,6 +30,7 @@ namespace DotNetCore.CAP
services
.
AddSingleton
<
IDataStorage
,
SqlServerDataStorage
>();
services
.
AddSingleton
<
IDataStorage
,
SqlServerDataStorage
>();
services
.
AddSingleton
<
IStorageInitializer
,
SqlServerStorageInitializer
>();
services
.
AddSingleton
<
IStorageInitializer
,
SqlServerStorageInitializer
>();
services
.
AddTransient
<
CapTransactionBase
,
SqlServerCapTransaction
>();
services
.
AddTransient
<
CapTransactionBase
,
SqlServerCapTransaction
>();
services
.
TryAddEnumerable
(
ServiceDescriptor
.
Singleton
<
IProcessingServer
,
DiagnosticRegister
>());
services
.
Configure
(
_configure
);
services
.
Configure
(
_configure
);
services
.
AddSingleton
<
IConfigureOptions
<
SqlServerOptions
>,
ConfigureSqlServerOptions
>();
services
.
AddSingleton
<
IConfigureOptions
<
SqlServerOptions
>,
ConfigureSqlServerOptions
>();
...
...
src/DotNetCore.CAP.SqlServer/Diagnostics/IProcessingServer.DiagnosticRegister.cs
0 → 100644
View file @
73438646
// Copyright (c) .NET Core Community. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.
using
System.Diagnostics
;
using
DotNetCore.CAP.Internal
;
namespace
DotNetCore.CAP.SqlServer.Diagnostics
{
public
class
DiagnosticRegister
:
IProcessingServer
{
private
readonly
DiagnosticProcessorObserver
_diagnosticProcessorObserver
;
public
DiagnosticRegister
(
DiagnosticProcessorObserver
diagnosticProcessorObserver
)
{
_diagnosticProcessorObserver
=
diagnosticProcessorObserver
;
}
public
void
Dispose
()
{
}
public
void
Pulse
()
{
}
public
void
Start
()
{
DiagnosticListener
.
AllListeners
.
Subscribe
(
_diagnosticProcessorObserver
);
}
}
}
src/DotNetCore.CAP.SqlServer/IStorageInitializer.SqlServer.cs
View file @
73438646
// Copyright (c) .NET Core Community. All rights reserved.
// Copyright (c) .NET Core Community. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.
// Licensed under the MIT License. See License.txt in the project root for license information.
using
System.Diagnostics
;
using
System.Threading
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
System.Threading.Tasks
;
using
Dapper
;
using
Dapper
;
using
DotNetCore.CAP.Persistence
;
using
DotNetCore.CAP.Persistence
;
using
DotNetCore.CAP.SqlServer.Diagnostics
;
using
Microsoft.Data.SqlClient
;
using
Microsoft.Data.SqlClient
;
using
Microsoft.Extensions.Logging
;
using
Microsoft.Extensions.Logging
;
using
Microsoft.Extensions.Options
;
using
Microsoft.Extensions.Options
;
...
@@ -15,17 +13,14 @@ namespace DotNetCore.CAP.SqlServer
...
@@ -15,17 +13,14 @@ namespace DotNetCore.CAP.SqlServer
{
{
public
class
SqlServerStorageInitializer
:
IStorageInitializer
public
class
SqlServerStorageInitializer
:
IStorageInitializer
{
{
private
readonly
DiagnosticProcessorObserver
_diagnosticProcessorObserver
;
private
readonly
ILogger
_logger
;
private
readonly
ILogger
_logger
;
private
readonly
IOptions
<
SqlServerOptions
>
_options
;
private
readonly
IOptions
<
SqlServerOptions
>
_options
;
public
SqlServerStorageInitializer
(
public
SqlServerStorageInitializer
(
ILogger
<
SqlServerStorageInitializer
>
logger
,
ILogger
<
SqlServerStorageInitializer
>
logger
,
IOptions
<
SqlServerOptions
>
options
,
IOptions
<
SqlServerOptions
>
options
)
DiagnosticProcessorObserver
diagnosticProcessorObserver
)
{
{
_options
=
options
;
_options
=
options
;
_diagnosticProcessorObserver
=
diagnosticProcessorObserver
;
_logger
=
logger
;
_logger
=
logger
;
}
}
...
@@ -50,11 +45,8 @@ namespace DotNetCore.CAP.SqlServer
...
@@ -50,11 +45,8 @@ namespace DotNetCore.CAP.SqlServer
}
}
_logger
.
LogDebug
(
"Ensuring all create database tables script are applied."
);
_logger
.
LogDebug
(
"Ensuring all create database tables script are applied."
);
DiagnosticListener
.
AllListeners
.
Subscribe
(
_diagnosticProcessorObserver
);
}
}
protected
virtual
string
CreateDbTablesScript
(
string
schema
)
protected
virtual
string
CreateDbTablesScript
(
string
schema
)
{
{
var
batchSql
=
var
batchSql
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment