github/arthas
4
0
Fork 0
mirror of https://github.com/alibaba/arthas.git synced 2024-04-21 10:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename InputStatusVO to InputStatusModel

Browse Source
This commit is contained in:
gongdewei
2020-05-21 18:58:17 +08:00
parent a13fcb23dc
commit 2cdaf9ffa4
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/taobao/arthas/core/command/model/InputStatusVO.java → core/src/main/java/com/taobao/arthas/core/command/model/InputStatusModel.java
+2 -2
View File
@@ -4,11 +4,11 @@ package com.taobao.arthas.core.command.model;
* Input status for webui
* @author gongdewei 2020/4/14
*/
public class InputStatusVO extends ResultModel {
public class InputStatusModel extends ResultModel {
private InputStatus inputStatus;
public InputStatusVO(InputStatus inputStatus) {
public InputStatusModel(InputStatus inputStatus) {
this.inputStatus = inputStatus;
}
core/src/main/java/com/taobao/arthas/core/distribution/impl/SharingResultDistributorImpl.java
+4 -4
View File
@@ -2,7 +2,7 @@ package com.taobao.arthas.core.distribution.impl;
import com.alibaba.arthas.deps.org.slf4j.Logger;
import com.alibaba.arthas.deps.org.slf4j.LoggerFactory;
import com.taobao.arthas.core.command.model.InputStatusVO;
import com.taobao.arthas.core.command.model.InputStatusModel;
import com.taobao.arthas.core.command.model.MessageModel;
import com.taobao.arthas.core.command.model.ResultModel;
import com.taobao.arthas.core.distribution.DistributorOptions;
@@ -138,15 +138,15 @@ public class SharingResultDistributorImpl implements SharingResultDistributor {
private class SharingResultConsumerImpl implements ResultConsumer {
private BlockingQueue<ResultModel> resultQueue = new ArrayBlockingQueue<ResultModel>(DistributorOptions.resultQueueSize);
private ReentrantLock queueLock = new ReentrantLock();
private InputStatusVO lastInputStatus;
private InputStatusModel lastInputStatus;
@Override
public boolean appendResult(ResultModel result) {
queueLock.lock();
try {
//输入状态不入历史指令队列，复制时在最后发送
if (result instanceof InputStatusVO) {
lastInputStatus = (InputStatusVO) result;
if (result instanceof InputStatusModel) {
lastInputStatus = (InputStatusModel) result;
return true;
}
while (!resultQueue.offer(result)) {
core/src/main/java/com/taobao/arthas/core/shell/term/impl/http/api/HttpApiHandler.java
+2 -2
View File
@@ -311,7 +311,7 @@ public class HttpApiHandler {
* @param inputStatus
*/
private void updateSessionInputStatus(Session session, InputStatus inputStatus) {
session.getResultDistributor().appendResult(new InputStatusVO(inputStatus));
session.getResultDistributor().appendResult(new InputStatusModel(inputStatus));
}
private ApiResponse processJoinSessionRequest(ApiRequest apiRequest, Session session) {
@@ -319,7 +319,7 @@ public class HttpApiHandler {
//create consumer
ResultConsumer resultConsumer = new ResultConsumerImpl();
//disable input and interrupt
resultConsumer.appendResult(new InputStatusVO(InputStatus.DISABLED));
resultConsumer.appendResult(new InputStatusModel(InputStatus.DISABLED));
session.getResultDistributor().addConsumer(resultConsumer);
ApiResponse response = new ApiResponse();