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
f6ca2cc4
Commit
f6ca2cc4
authored
Sep 15, 2017
by
yangxiaodong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup.
parent
7930e82c
Changes
44
Show whitespace changes
Inline
Side-by-side
Showing
44 changed files
with
90 additions
and
104 deletions
+90
-104
BatchCommandDispatcher.cs
src/DotNetCore.CAP/Dashboard/BatchCommandDispatcher.cs
+1
-1
CombinedResourceDispatcher.cs
src/DotNetCore.CAP/Dashboard/CombinedResourceDispatcher.cs
+4
-4
CommandDispatcher.cs
src/DotNetCore.CAP/Dashboard/CommandDispatcher.cs
+2
-2
DashboardContext.cs
src/DotNetCore.CAP/Dashboard/DashboardContext.cs
+1
-3
DashboardMetric.cs
src/DotNetCore.CAP/Dashboard/DashboardMetric.cs
+1
-1
DashboardMetrics.cs
src/DotNetCore.CAP/Dashboard/DashboardMetrics.cs
+2
-2
DashboardRequest.cs
src/DotNetCore.CAP/Dashboard/DashboardRequest.cs
+4
-1
DashboardResponse.cs
src/DotNetCore.CAP/Dashboard/DashboardResponse.cs
+2
-1
DashboardRoutes.cs
src/DotNetCore.CAP/Dashboard/DashboardRoutes.cs
+7
-8
EmbeddedResourceDispatcher.cs
src/DotNetCore.CAP/Dashboard/EmbeddedResourceDispatcher.cs
+3
-3
HtmlHelper.cs
src/DotNetCore.CAP/Dashboard/HtmlHelper.cs
+3
-4
IDashboardAuthorizationFilter.cs
...DotNetCore.CAP/Dashboard/IDashboardAuthorizationFilter.cs
+1
-1
IDashboardDispatcher.cs
src/DotNetCore.CAP/Dashboard/IDashboardDispatcher.cs
+2
-5
IMonitoringApi.cs
src/DotNetCore.CAP/Dashboard/IMonitoringApi.cs
+10
-3
JobHistoryRenderer.cs
src/DotNetCore.CAP/Dashboard/JobHistoryRenderer.cs
+2
-2
JsonDispatcher.cs
src/DotNetCore.CAP/Dashboard/JsonDispatcher.cs
+1
-2
JsonStats.cs
src/DotNetCore.CAP/Dashboard/JsonStats.cs
+2
-2
LocalRequestsOnlyAuthorizationFilter.cs
...ore.CAP/Dashboard/LocalRequestsOnlyAuthorizationFilter.cs
+1
-3
MenuItem.cs
src/DotNetCore.CAP/Dashboard/MenuItem.cs
+1
-1
MessagesSidebarMenu.cs
src/DotNetCore.CAP/Dashboard/MessagesSidebarMenu.cs
+1
-2
Metric.cs
src/DotNetCore.CAP/Dashboard/Metric.cs
+5
-6
MessageDto.cs
src/DotNetCore.CAP/Dashboard/Monitoring/MessageDto.cs
+1
-0
MessageQueryDto.cs
src/DotNetCore.CAP/Dashboard/Monitoring/MessageQueryDto.cs
+3
-6
ServerDto.cs
src/DotNetCore.CAP/Dashboard/Monitoring/ServerDto.cs
+1
-4
StateHistoryDto.cs
src/DotNetCore.CAP/Dashboard/Monitoring/StateHistoryDto.cs
+1
-1
StatisticsDto.cs
src/DotNetCore.CAP/Dashboard/Monitoring/StatisticsDto.cs
+1
-1
NavigationMenu.cs
src/DotNetCore.CAP/Dashboard/NavigationMenu.cs
+1
-1
NonEscapedString.cs
src/DotNetCore.CAP/Dashboard/NonEscapedString.cs
+1
-1
Pager.cs
src/DotNetCore.CAP/Dashboard/Pager.cs
+2
-2
BlockMetric.cs
src/DotNetCore.CAP/Dashboard/Pages/BlockMetric.cs
+1
-1
Breadcrumbs.cs
src/DotNetCore.CAP/Dashboard/Pages/Breadcrumbs.cs
+1
-1
HomePage.cs
src/DotNetCore.CAP/Dashboard/Pages/HomePage.cs
+1
-1
InlineMetric.cs
src/DotNetCore.CAP/Dashboard/Pages/InlineMetric.cs
+1
-1
LayoutPage.cs
src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.cs
+1
-1
PublishedPage.cs
src/DotNetCore.CAP/Dashboard/Pages/PublishedPage.cs
+1
-3
ReceivedPage.cs
src/DotNetCore.CAP/Dashboard/Pages/ReceivedPage.cs
+1
-3
SidebarMenu.cs
src/DotNetCore.CAP/Dashboard/Pages/SidebarMenu.cs
+2
-2
_Paginator.cs
src/DotNetCore.CAP/Dashboard/Pages/_Paginator.cs
+1
-1
_PerPageSelector.cs
src/DotNetCore.CAP/Dashboard/Pages/_PerPageSelector.cs
+1
-1
RazorPage.cs
src/DotNetCore.CAP/Dashboard/RazorPage.cs
+5
-6
RazorPageDispatcher.cs
src/DotNetCore.CAP/Dashboard/RazorPageDispatcher.cs
+1
-1
RouteCollection.cs
src/DotNetCore.CAP/Dashboard/RouteCollection.cs
+1
-2
RouteCollectionExtensions.cs
src/DotNetCore.CAP/Dashboard/RouteCollectionExtensions.cs
+3
-3
UrlHelper.cs
src/DotNetCore.CAP/Dashboard/UrlHelper.cs
+2
-4
No files found.
src/DotNetCore.CAP/Dashboard/BatchCommandDispatcher.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/CombinedResourceDispatcher.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/CommandDispatcher.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/DashboardContext.cs
View file @
f6ca2cc4
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
System.Text.RegularExpressions
;
using
Microsoft.AspNetCore.Http
;
...
...
src/DotNetCore.CAP/Dashboard/DashboardMetric.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/DashboardMetrics.cs
View file @
f6ca2cc4
...
...
@@ -135,7 +135,6 @@ namespace DotNetCore.CAP.Dashboard
IntValue
=
page
.
Statistics
.
ReceivedSucceeded
});
//----------------------------------------------------
public
static
readonly
DashboardMetric
PublishedFailedCount
=
new
DashboardMetric
(
...
...
@@ -147,6 +146,7 @@ namespace DotNetCore.CAP.Dashboard
Style
=
page
.
Statistics
.
PublishedFailed
>
0
?
MetricStyle
.
Danger
:
MetricStyle
.
Default
,
Highlighted
=
page
.
Statistics
.
PublishedFailed
>
0
});
public
static
readonly
DashboardMetric
ReceivedFailedCount
=
new
DashboardMetric
(
"received_failed:count"
,
"Metrics_FailedJobs"
,
...
...
src/DotNetCore.CAP/Dashboard/DashboardRequest.cs
View file @
f6ca2cc4
...
...
@@ -15,6 +15,7 @@ namespace DotNetCore.CAP.Dashboard
public
abstract
string
RemoteIpAddress
{
get
;
}
public
abstract
string
GetQuery
(
string
key
);
public
abstract
Task
<
IList
<
string
>>
GetFormValuesAsync
(
string
key
);
}
...
...
@@ -33,7 +34,9 @@ namespace DotNetCore.CAP.Dashboard
public
override
string
PathBase
=>
_context
.
Request
.
PathBase
.
Value
;
public
override
string
LocalIpAddress
=>
_context
.
Connection
.
LocalIpAddress
.
ToString
();
public
override
string
RemoteIpAddress
=>
_context
.
Connection
.
RemoteIpAddress
.
ToString
();
public
override
string
GetQuery
(
string
key
)
=>
_context
.
Request
.
Query
[
key
];
public
override
async
Task
<
IList
<
string
>>
GetFormValuesAsync
(
string
key
)
{
var
form
=
await
_context
.
Request
.
ReadFormAsync
();
...
...
src/DotNetCore.CAP/Dashboard/DashboardResponse.cs
View file @
f6ca2cc4
...
...
@@ -14,6 +14,7 @@ namespace DotNetCore.CAP.Dashboard
public
abstract
Stream
Body
{
get
;
}
public
abstract
void
SetExpire
(
DateTimeOffset
?
value
);
public
abstract
Task
WriteAsync
(
string
text
);
}
...
...
@@ -21,7 +22,7 @@ namespace DotNetCore.CAP.Dashboard
{
private
readonly
HttpContext
_context
;
public
CapDashboardResponse
(
HttpContext
context
)
public
CapDashboardResponse
(
HttpContext
context
)
{
if
(
context
==
null
)
throw
new
ArgumentNullException
(
nameof
(
context
));
_context
=
context
;
...
...
src/DotNetCore.CAP/Dashboard/DashboardRoutes.cs
View file @
f6ca2cc4
...
...
@@ -72,11 +72,10 @@ namespace DotNetCore.CAP.Dashboard
GetExecutingAssembly
(),
GetContentResourceName
(
"fonts"
,
"glyphicons-halflings-regular.woff2"
)));
#
endregion
#
endregion
Embedded
static
content
#
region
Razor
pages
and
commands
Routes
.
AddJsonResult
(
"/published/message/(?<Id>.+)"
,
x
=>
{
var
id
=
int
.
Parse
(
x
.
UriMatch
.
Groups
[
"Id"
].
Value
);
...
...
@@ -186,7 +185,7 @@ namespace DotNetCore.CAP.Dashboard
//Routes.AddRazorPage("/servers", x => new ServersPage());
//Routes.AddRazorPage("/retries", x => new RetriesPage());
#
endregion
#
endregion
Razor
pages
and
commands
}
public
static
RouteCollection
Routes
{
get
;
}
...
...
src/DotNetCore.CAP/Dashboard/EmbeddedResourceDispatcher.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/HtmlHelper.cs
View file @
f6ca2cc4
...
...
@@ -2,12 +2,11 @@
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Net
;
using
System.Text
;
using
System.ComponentModel
;
using
System.Reflection
;
using
System.Text
;
using
System.Text.RegularExpressions
;
using
DotNetCore.CAP.Dashboard.Resources
;
using
DotNetCore.CAP.Dashboard.Pages
;
using
DotNetCore.CAP.Dashboard.Resources
;
using
DotNetCore.CAP.Infrastructure
;
using
DotNetCore.CAP.Models
;
using
Microsoft.Extensions.Internal
;
...
...
src/DotNetCore.CAP/Dashboard/IDashboardAuthorizationFilter.cs
View file @
f6ca2cc4
...
...
@@ -2,6 +2,6 @@
{
public
interface
IDashboardAuthorizationFilter
{
bool
Authorize
(
DashboardContext
context
);
bool
Authorize
(
DashboardContext
context
);
}
}
\ No newline at end of file
src/DotNetCore.CAP/Dashboard/IDashboardDispatcher.cs
View file @
f6ca2cc4
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
System.Threading.Tasks
;
using
System.Threading.Tasks
;
namespace
DotNetCore.CAP.Dashboard
{
...
...
src/DotNetCore.CAP/Dashboard/IMonitoringApi.cs
View file @
f6ca2cc4
...
...
@@ -11,16 +11,23 @@ namespace DotNetCore.CAP.Dashboard
IList
<
MessageDto
>
Messages
(
MessageQueryDto
queryDto
);
int
PublishedFailedCount
();
int
PublishedProcessingCount
();
int
PublishedSucceededCount
();
int
ReceivedFailedCount
();
int
ReceivedProcessingCount
();
int
ReceivedSucceededCount
();
IDictionary
<
DateTime
,
int
>
SucceededByDatesCount
();
IDictionary
<
DateTime
,
int
>
FailedByDatesCount
();
IDictionary
<
DateTime
,
int
>
HourlySucceededJobs
();
IDictionary
<
DateTime
,
int
>
HourlyFailedJobs
();
}
}
\ No newline at end of file
src/DotNetCore.CAP/Dashboard/JobHistoryRenderer.cs
View file @
f6ca2cc4
...
...
@@ -14,6 +14,7 @@ namespace DotNetCore.CAP.Dashboard
private
static
readonly
IDictionary
<
string
,
string
>
BackgroundStateColors
=
new
Dictionary
<
string
,
string
>();
private
static
readonly
IDictionary
<
string
,
string
>
ForegroundStateColors
=
new
Dictionary
<
string
,
string
>();
...
...
@@ -144,7 +145,6 @@ namespace DotNetCore.CAP.Dashboard
itemsAdded
=
true
;
}
if
(
stateData
.
ContainsKey
(
"Result"
)
&&
!
String
.
IsNullOrWhiteSpace
(
stateData
[
"Result"
]))
{
var
result
=
stateData
[
"Result"
];
...
...
src/DotNetCore.CAP/Dashboard/JsonDispatcher.cs
View file @
f6ca2cc4
using
System
;
using
System.Net
;
using
System.Threading.Tasks
;
using
Newtonsoft.Json
;
using
Newtonsoft.Json.Converters
;
...
...
src/DotNetCore.CAP/Dashboard/JsonStats.cs
View file @
f6ca2cc4
...
...
@@ -27,7 +27,7 @@ namespace DotNetCore.CAP.Dashboard
var
settings
=
new
JsonSerializerSettings
{
ContractResolver
=
new
CamelCasePropertyNamesContractResolver
(),
Converters
=
new
JsonConverter
[]{
new
StringEnumConverter
{
CamelCaseText
=
true
}
}
Converters
=
new
JsonConverter
[]
{
new
StringEnumConverter
{
CamelCaseText
=
true
}
}
};
var
serialized
=
JsonConvert
.
SerializeObject
(
result
,
settings
);
...
...
src/DotNetCore.CAP/Dashboard/LocalRequestsOnlyAuthorizationFilter.cs
View file @
f6ca2cc4
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
DotNetCore.CAP.Dashboard
{
...
...
src/DotNetCore.CAP/Dashboard/MenuItem.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/MessagesSidebarMenu.cs
View file @
f6ca2cc4
...
...
@@ -51,7 +51,6 @@ namespace DotNetCore.CAP.Dashboard
Active
=
page
.
RequestPath
.
StartsWith
(
"/received/failed"
),
Metric
=
DashboardMetrics
.
ReceivedFailedCount
});
}
}
}
\ No newline at end of file
src/DotNetCore.CAP/Dashboard/Metric.cs
View file @
f6ca2cc4
namespace
DotNetCore.CAP.Dashboard
namespace
DotNetCore.CAP.Dashboard
{
public
class
Metric
{
...
...
src/DotNetCore.CAP/Dashboard/Monitoring/MessageDto.cs
View file @
f6ca2cc4
using
System
;
namespace
DotNetCore.CAP.Dashboard.Monitoring
{
public
class
MessageDto
...
...
src/DotNetCore.CAP/Dashboard/Monitoring/MessageQueryDto.cs
View file @
f6ca2cc4
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
DotNetCore.CAP.Models
;
using
DotNetCore.CAP.Models
;
namespace
DotNetCore.CAP.Dashboard.Monitoring
{
...
...
src/DotNetCore.CAP/Dashboard/Monitoring/ServerDto.cs
View file @
f6ca2cc4
using
System
;
using
System.Collections.Generic
;
namespace
DotNetCore.CAP.Dashboard.Monitoring
namespace
DotNetCore.CAP.Dashboard.Monitoring
{
public
class
SubscriberDto
{
...
...
src/DotNetCore.CAP/Dashboard/Monitoring/StateHistoryDto.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/Monitoring/StatisticsDto.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/NavigationMenu.cs
View file @
f6ca2cc4
...
...
@@ -13,7 +13,7 @@ namespace DotNetCore.CAP.Dashboard
Items
.
Add
(
page
=>
new
MenuItem
(
Strings
.
NavigationMenu_Published
,
page
.
Url
.
LinkToPublished
())
{
Active
=
page
.
RequestPath
.
StartsWith
(
"/published"
),
Metrics
=
new
[]
Metrics
=
new
[]
{
DashboardMetrics
.
PublishedSucceededCount
,
DashboardMetrics
.
PublishedFailedCountOrNull
...
...
src/DotNetCore.CAP/Dashboard/NonEscapedString.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/Pager.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/Pages/BlockMetric.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/Pages/Breadcrumbs.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/Pages/HomePage.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/Pages/InlineMetric.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/Pages/PublishedPage.cs
View file @
f6ca2cc4
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
DotNetCore.CAP.Processor.States
;
namespace
DotNetCore.CAP.Dashboard.Pages
...
...
src/DotNetCore.CAP/Dashboard/Pages/ReceivedPage.cs
View file @
f6ca2cc4
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
DotNetCore.CAP.Processor.States
;
namespace
DotNetCore.CAP.Dashboard.Pages
...
...
src/DotNetCore.CAP/Dashboard/Pages/SidebarMenu.cs
View file @
f6ca2cc4
...
...
@@ -5,7 +5,7 @@ namespace DotNetCore.CAP.Dashboard.Pages
{
partial
class
SidebarMenu
{
public
SidebarMenu
(
IEnumerable
<
Func
<
RazorPage
,
MenuItem
>>
items
)
public
SidebarMenu
(
IEnumerable
<
Func
<
RazorPage
,
MenuItem
>>
items
)
{
if
(
items
==
null
)
throw
new
ArgumentNullException
(
nameof
(
items
));
Items
=
items
;
...
...
src/DotNetCore.CAP/Dashboard/Pages/_Paginator.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/Pages/_PerPageSelector.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/RazorPage.cs
View file @
f6ca2cc4
...
...
@@ -2,7 +2,6 @@
using
System.Diagnostics
;
using
System.Net
;
using
System.Text
;
using
System.Threading.Tasks
;
using
DotNetCore.CAP.Dashboard.Monitoring
;
namespace
DotNetCore.CAP.Dashboard
...
...
src/DotNetCore.CAP/Dashboard/RazorPageDispatcher.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/RouteCollection.cs
View file @
f6ca2cc4
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
System.Text.RegularExpressions
;
namespace
DotNetCore.CAP.Dashboard
...
...
src/DotNetCore.CAP/Dashboard/RouteCollectionExtensions.cs
View file @
f6ca2cc4
src/DotNetCore.CAP/Dashboard/UrlHelper.cs
View file @
f6ca2cc4
using
System
;
using
System.Collections.Generic
;
namespace
DotNetCore.CAP.Dashboard
{
public
class
UrlHelper
{
private
readonly
DashboardContext
_context
;
public
UrlHelper
(
DashboardContext
context
)
public
UrlHelper
(
DashboardContext
context
)
{
if
(
context
==
null
)
throw
new
ArgumentNullException
(
nameof
(
context
));
_context
=
context
;
...
...
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