Skip to content

[ZEPPELIN-6512] Fix typos in variable names and log messages in terminal classes #5286

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

Open
ParkGyeongTae wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −12
Open

[ZEPPELIN-6512] Fix typos in variable names and log messages in terminal classes #5286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions shell/src/main/java/org/apache/zeppelin/shell/terminal/TerminalManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,16 @@ public void removeTerminalService(TerminalSocket terminalSocket) {
if (terminalSocket2Service.containsKey(terminalSocketHashcode)) {
terminalSocket2Service.remove(terminalSocketHashcode);
} else {
LOGGER.error("Cann't find TerminalSocket: " + terminalSocketHashcode);
LOGGER.error("Can't find TerminalSocket: " + terminalSocketHashcode);
LOGGER.error(terminalSocket2Service.toString());
}
}

public void cleanIntpContext(String nodeId) {
String keyPrex = nodeId + "@";
public void cleanIntpContext(String noteId) {
String keyPrefix = noteId + "@";
for (Map.Entry<String, InterpreterContext> entity : noteParagraphId2IntpContext.entrySet()) {
String key = entity.getKey();
if (key.contains(keyPrex)) {
if (key.contains(keyPrefix)) {
LOGGER.info("cleanIntpContext : " + key);
noteParagraphId2IntpContext.remove(key);
}
Expand Down Expand Up @@ -109,7 +109,7 @@ public void onWebSocketConnect(String noteId, String paragraphId) {
intpContext.getAngularObjectRegistry().add(TERMINAL_SOCKET_STATUS, TERMINAL_SOCKET_CONNECT,
intpContext.getNoteId(), intpContext.getParagraphId());
} else {
LOGGER.error("Cann't find InterpreterContext from : " + id);
LOGGER.error("Can't find InterpreterContext from : " + id);
LOGGER.error(noteParagraphId2IntpContext.toString());
}
}
Expand All @@ -121,7 +121,7 @@ public void onWebSocketClose(TerminalSocket terminalSocket, String noteId, Strin
intpContext.getAngularObjectRegistry().add(TERMINAL_SOCKET_STATUS, TERMINAL_SOCKET_CLOSE,
intpContext.getNoteId(), intpContext.getParagraphId());
} else {
LOGGER.error("Cann't find InterpreterContext from : " + id);
LOGGER.error("Can't find InterpreterContext from : " + id);
LOGGER.error(noteParagraphId2IntpContext.toString());
}

Expand All @@ -136,7 +136,7 @@ public void onWebSocketError(TerminalSocket terminalSocket, String noteId, Strin
intpContext.getAngularObjectRegistry().add(TERMINAL_SOCKET_STATUS, TERMINAL_SOCKET_ERROR,
intpContext.getNoteId(), intpContext.getParagraphId());
} else {
LOGGER.error("Cann't find InterpreterContext from : " + id);
LOGGER.error("Can't find InterpreterContext from : " + id);
LOGGER.error(noteParagraphId2IntpContext.toString());
}
}
Expand Down
8 changes: 4 additions & 4 deletions shell/src/main/java/org/apache/zeppelin/shell/terminal/TerminalThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ public class TerminalThread extends Thread {
private Server jettyServer = new Server();

private int port = 0;
private String allwedOrigin;
private String allowedOrigin;

public TerminalThread(int port, String allwedOrigin) {
public TerminalThread(int port, String allowedOrigin) {
this.port = port;
this.allwedOrigin = allwedOrigin;
this.allowedOrigin = allowedOrigin;
}

@Override
Expand Down Expand Up @@ -80,7 +80,7 @@ public void run() {
(servletContext, container) ->
container.addEndpoint(
ServerEndpointConfig.Builder.create(TerminalSocket.class, "/")
.configurator(new TerminalSessionConfigurator(allwedOrigin))
.configurator(new TerminalSessionConfigurator(allowedOrigin))
.build()));
jettyServer.start();
jettyServer.join();
Expand Down
2 changes: 1 addition & 1 deletion shell/src/main/java/org/apache/zeppelin/shell/terminal/websocket/TerminalSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void onWebSocketText(String message) {
terminalService.onTerminalResize(messageMap.get("columns"), messageMap.get("rows"));
break;
default:
LOGGER.error("Unrecodnized action: {}", message);
LOGGER.error("Unrecognized action: {}", message);
}
}
}
Expand Down
Loading