这是indexloc提供的服务，不要输入任何密码
Skip to content

Changed: Refactor LocalSocketRunConfig #2816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Changed: Refactor LocalSocketRunConfig #2816

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29d3a59
Added: Add `getLogVariableList()` at `LocalSocketRunConfig.java`
rubinstory May 20, 2022
d6ef3c5
Docs: Add Comments at `getLogVariableList()` in
rubinstory May 20, 2022
676f518
Changed: Delete `localVariableList` in `getLogString()` and
rubinstory May 29, 2022
31346b2
Merge branch 'master' into PNU/LocalSocketRunConfig
rubinstory May 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 31 additions & 16 deletions termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketRunConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.termux.shared.net.socket.local;

import android.util.Pair;

import androidx.annotation.NonNull;

import com.termux.shared.file.FileUtils;
Expand All @@ -8,6 +10,8 @@

import java.io.Serializable;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;


/**
Expand Down Expand Up @@ -207,20 +211,35 @@ public static String getRunConfigLogString(final LocalSocketRunConfig config) {
return config.getLogString();
}

/**
* Get log variables {@link List<Pair<String, Object>>} for {@link LocalSocketRunConfig}.
*
* @return Returns the log variables in list {@link List<Pair<String, Object>>}.
*/
private List<Pair<String, Object>> getLogVariableList() {
List<Pair<String, Object>> logVariableList = new ArrayList<Pair<String, Object>>() {{
add(Pair.create("Path", mPath));
add(Pair.create("AbstractNamespaceSocket", mAbstractNamespaceSocket));
add(Pair.create("LocalSocketManagerClient", mLocalSocketManagerClient.getClass().getName()));
add(Pair.create("FD", mFD));
add(Pair.create("ReceiveTimeout", getReceiveTimeout()));
add(Pair.create("SendTimeout", getSendTimeout()));
add(Pair.create("Deadline", getDeadline()));
add(Pair.create("Backlog", getBacklog()));
}};
return logVariableList;
}

/** Get a log {@link String} for the {@link LocalSocketRunConfig}. */
@NonNull
public String getLogString() {
StringBuilder logString = new StringBuilder();

logString.append(mTitle).append(" Socket Server Run Config:");
logString.append("\n").append(Logger.getSingleLineLogStringEntry("Path", mPath, "-"));
logString.append("\n").append(Logger.getSingleLineLogStringEntry("AbstractNamespaceSocket", mAbstractNamespaceSocket, "-"));
logString.append("\n").append(Logger.getSingleLineLogStringEntry("LocalSocketManagerClient", mLocalSocketManagerClient.getClass().getName(), "-"));
logString.append("\n").append(Logger.getSingleLineLogStringEntry("FD", mFD, "-"));
logString.append("\n").append(Logger.getSingleLineLogStringEntry("ReceiveTimeout", getReceiveTimeout(), "-"));
logString.append("\n").append(Logger.getSingleLineLogStringEntry("SendTimeout", getSendTimeout(), "-"));
logString.append("\n").append(Logger.getSingleLineLogStringEntry("Deadline", getDeadline(), "-"));
logString.append("\n").append(Logger.getSingleLineLogStringEntry("Backlog", getBacklog(), "-"));

for(Pair<String, Object> logVar: getLogVariableList()) {
logString.append("\n").append(Logger.getSingleLineLogStringEntry(logVar.first, logVar.second, "-"));
}

return logString.toString();
}
Expand All @@ -242,14 +261,10 @@ public String getMarkdownString() {
StringBuilder markdownString = new StringBuilder();

markdownString.append("## ").append(mTitle).append(" Socket Server Run Config");
markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Path", mPath, "-"));
markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("AbstractNamespaceSocket", mAbstractNamespaceSocket, "-"));
markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("LocalSocketManagerClient", mLocalSocketManagerClient.getClass().getName(), "-"));
markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("FD", mFD, "-"));
markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("ReceiveTimeout", getReceiveTimeout(), "-"));
markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("SendTimeout", getSendTimeout(), "-"));
markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Deadline", getDeadline(), "-"));
markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Backlog", getBacklog(), "-"));

for(Pair<String, Object> logVar: getLogVariableList()) {
markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry(logVar.first, logVar.second, "-"));
}

return markdownString.toString();
}
Expand Down