Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
apollo
Project overview
Project overview
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
Administrator
apollo
Commits
9742ae28
Commit
9742ae28
authored
Aug 24, 2019
by
Jason Song
Committed by
kezhenxu94
Aug 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename timeout to timeoutInMilli for better understanding (#2543)
parent
8eac52e5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/config/BizConfig.java
...java/com/ctrip/framework/apollo/biz/config/BizConfig.java
+1
-1
apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/NotificationControllerV2.java
...lo/configservice/controller/NotificationControllerV2.java
+1
-1
apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/wrapper/DeferredResultWrapper.java
...k/apollo/configservice/wrapper/DeferredResultWrapper.java
+2
-2
No files found.
apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/config/BizConfig.java
View file @
9742ae28
...
@@ -59,7 +59,7 @@ public class BizConfig extends RefreshableConfig {
...
@@ -59,7 +59,7 @@ public class BizConfig extends RefreshableConfig {
return
checkInt
(
interval
,
1
,
Integer
.
MAX_VALUE
,
DEFAULT_GRAY_RELEASE_RULE_SCAN_INTERVAL
);
return
checkInt
(
interval
,
1
,
Integer
.
MAX_VALUE
,
DEFAULT_GRAY_RELEASE_RULE_SCAN_INTERVAL
);
}
}
public
long
longPollingTimeout
()
{
public
long
longPollingTimeout
InMilli
()
{
int
timeout
=
getIntProperty
(
"long.polling.timeout"
,
DEFAULT_LONG_POLLING_TIMEOUT
);
int
timeout
=
getIntProperty
(
"long.polling.timeout"
,
DEFAULT_LONG_POLLING_TIMEOUT
);
return
1000
*
checkInt
(
timeout
,
1
,
Integer
.
MAX_VALUE
,
DEFAULT_LONG_POLLING_TIMEOUT
);
return
1000
*
checkInt
(
timeout
,
1
,
Integer
.
MAX_VALUE
,
DEFAULT_LONG_POLLING_TIMEOUT
);
}
}
...
...
apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/NotificationControllerV2.java
View file @
9742ae28
...
@@ -108,7 +108,7 @@ public class NotificationControllerV2 implements ReleaseMessageListener {
...
@@ -108,7 +108,7 @@ public class NotificationControllerV2 implements ReleaseMessageListener {
throw
new
BadRequestException
(
"Invalid format of notifications: "
+
notificationsAsString
);
throw
new
BadRequestException
(
"Invalid format of notifications: "
+
notificationsAsString
);
}
}
DeferredResultWrapper
deferredResultWrapper
=
new
DeferredResultWrapper
(
bizConfig
.
longPollingTimeout
());
DeferredResultWrapper
deferredResultWrapper
=
new
DeferredResultWrapper
(
bizConfig
.
longPollingTimeout
InMilli
());
Set
<
String
>
namespaces
=
Sets
.
newHashSet
();
Set
<
String
>
namespaces
=
Sets
.
newHashSet
();
Map
<
String
,
Long
>
clientSideNotifications
=
Maps
.
newHashMap
();
Map
<
String
,
Long
>
clientSideNotifications
=
Maps
.
newHashMap
();
Map
<
String
,
ApolloConfigNotification
>
filteredNotifications
=
filterNotifications
(
appId
,
notifications
);
Map
<
String
,
ApolloConfigNotification
>
filteredNotifications
=
filterNotifications
(
appId
,
notifications
);
...
...
apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/wrapper/DeferredResultWrapper.java
View file @
9742ae28
...
@@ -23,8 +23,8 @@ public class DeferredResultWrapper {
...
@@ -23,8 +23,8 @@ public class DeferredResultWrapper {
private
DeferredResult
<
ResponseEntity
<
List
<
ApolloConfigNotification
>>>
result
;
private
DeferredResult
<
ResponseEntity
<
List
<
ApolloConfigNotification
>>>
result
;
public
DeferredResultWrapper
(
long
timeout
)
{
public
DeferredResultWrapper
(
long
timeout
InMilli
)
{
result
=
new
DeferredResult
<>(
timeout
,
NOT_MODIFIED_RESPONSE_LIST
);
result
=
new
DeferredResult
<>(
timeout
InMilli
,
NOT_MODIFIED_RESPONSE_LIST
);
}
}
public
void
recordNamespaceNameNormalizedResult
(
String
originalNamespaceName
,
String
normalizedNamespaceName
)
{
public
void
recordNamespaceNameNormalizedResult
(
String
originalNamespaceName
,
String
normalizedNamespaceName
)
{
...
...
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