Merge pull request #718 from gunlee01/feature/xlog-filter

[client] xlog filter - support sync & async condition.
scouter-project · Jul 18, 2020 · 3b63aa3 · 3b63aa3
2 parents 7ad2c1d + 85c7c59
commit 3b63aa3
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 0 deletions.
diff --git a/scouter.client/src/scouter/client/xlog/XLogFilterStatus.java b/scouter.client/src/scouter/client/xlog/XLogFilterStatus.java
@@ -23,6 +23,8 @@ public class XLogFilterStatus {
 	public boolean onlySql;
 	public boolean onlyApicall;
 	public boolean onlyError;
+	public boolean onlySync;
+	public boolean onlyAsync;
 	public String profileSizeText = "";
 	public String profileBytesText = "";
 
@@ -47,6 +49,8 @@ public int hashCode() {
 		filter_hash ^= HashUtil.hash(onlyError ? "onlyError" : "");
 		filter_hash ^= HashUtil.hash(onlySql ? "onlySql" : "");
 		filter_hash ^= HashUtil.hash(onlyApicall ? "onlyApicall" : "");
+		filter_hash ^= HashUtil.hash(onlySync ? "onlySync" : "");
+		filter_hash ^= HashUtil.hash(onlyAsync ? "onlyAsync" : "");
 		filter_hash ^= HashUtil.hash(profileSizeText);
 		filter_hash ^= HashUtil.hash(profileBytesText);
 		return filter_hash;
@@ -73,6 +77,8 @@ public XLogFilterStatus clone() {
 		status.onlySql = onlySql;
 		status.onlyApicall = onlyApicall;
 		status.onlyError = onlyError;
+		status.onlySync = onlySync;
+		status.onlyAsync = onlyAsync;
 		return status;
 	}
 }
diff --git a/scouter.client/src/scouter/client/xlog/dialog/XLogFilterDialog.java b/scouter.client/src/scouter/client/xlog/dialog/XLogFilterDialog.java
@@ -54,6 +54,7 @@ public class XLogFilterDialog extends Dialog {
 	Text serviceTxt, ipTxt, startHmsFromTxt, startHmsToTxt, resTimeFromTxt, resTimeToTxt, userAgentTxt, loginText, descText;
 	Text hasDumpYn, text1Text, text2Text, text3Text, text4Text, text5Text, profileSizeText, profileByteText;
 	Button onlySqlBtn, onlyApiBtn, onlyErrorBtn;
+	Button onlySyncBtn, onlyAsyncBtn;
 	Button clearBtn, applyBtn;
 
 	XLogViewCommon view;
@@ -386,6 +387,28 @@ public void widgetSelected(SelectionEvent e) {
 				compareHash();
 			}
 		});
+
+		onlySyncBtn = new Button(checkGroup, SWT.CHECK);
+		onlySyncBtn.setText("Sync");
+		onlySyncBtn.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, true, false));
+		onlySyncBtn.setSelection(status.onlySync);
+		onlySyncBtn.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				newStatus.onlySync = onlySyncBtn.getSelection();
+				compareHash();
+			}
+		});
+
+		onlyAsyncBtn = new Button(checkGroup, SWT.CHECK);
+		onlyAsyncBtn.setText("Async");
+		onlyAsyncBtn.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, true, false));
+		onlyAsyncBtn.setSelection(status.onlyAsync);
+		onlyAsyncBtn.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				newStatus.onlyAsync = onlyAsyncBtn.getSelection();
+				compareHash();
+			}
+		});
 
 		Composite btnComp = new Composite(container, SWT.NONE);
 		btnComp.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, false));
@@ -417,6 +440,8 @@ public void widgetSelected(SelectionEvent e) {
 				onlySqlBtn.setSelection(false);
 				onlyApiBtn.setSelection(false);
 				onlyErrorBtn.setSelection(false);
+				onlySyncBtn.setSelection(false);
+				onlyAsyncBtn.setSelection(false);
 				profileSizeText.setText("");
 				profileByteText.setText("");
 				newStatus = new XLogFilterStatus();

diff --git a/scouter.client/src/scouter/client/xlog/views/XLogViewPainter.java b/scouter.client/src/scouter/client/xlog/views/XLogViewPainter.java
@@ -648,6 +648,8 @@ && isUserAgentFilterOk(d)
 				&& isErrorFilterOk(d.p)
 				&& isApicallFilterOk(d.p)
 				&& isSqlFilterOk(d.p)
+				&& isSyncOk(d.p)
+				&& isAsyncOk(d.p)
 				&& isProfileSizeFilterOk(d.p)
 				&& isProfileByteFilterOk(d.p)
 				;
@@ -866,6 +868,20 @@ public boolean isSqlFilterOk(XLogPack p) {
 		}
 		return true;
 	}
+
+	public boolean isSyncOk(XLogPack p) {
+		if (filterStatus.onlySync) {
+			return p.xType != 2 &&  p.xType != 3 &&  p.xType != 4;
+		}
+		return true;
+	}
+
+	public boolean isAsyncOk(XLogPack p) {
+		if (filterStatus.onlyAsync) {
+			return p.xType == 2 ||  p.xType == 3 ||  p.xType == 4;
+		}
+		return true;
+	}
 
 	public boolean isApicallFilterOk(XLogPack p) {
 		if (filterStatus.onlyApicall) {