From 98f2b72086164cef1b1feeb55f43f6bb9f4f7924 Mon Sep 17 00:00:00 2001 From: Vladislav Kalugin Date: Mon, 18 Mar 2024 18:01:39 +0300 Subject: [PATCH] update --- server/src/utils/CLIUtils.cpp | 2 +- submodules/build-klee.sh | 0 vscode-plugin/package.json | 10 +++++----- vscode-plugin/src/client/client.ts | 7 +++---- vscode-plugin/src/config/projectConfig.ts | 8 ++++---- vscode-plugin/src/test/run.sh | 0 6 files changed, 13 insertions(+), 14 deletions(-) mode change 100644 => 100755 submodules/build-klee.sh mode change 100644 => 100755 vscode-plugin/src/test/run.sh diff --git a/server/src/utils/CLIUtils.cpp b/server/src/utils/CLIUtils.cpp index 2d7e8d0cd..77cdc5f52 100644 --- a/server/src/utils/CLIUtils.cpp +++ b/server/src/utils/CLIUtils.cpp @@ -36,7 +36,7 @@ void CLIUtils::setupLogger(const std::string &logPath, CLIUtils::setOptPath(logPath, Paths::logPath); const fs::path symLink = Paths::getSymLinkPathToLogLatest(); const std::string logfile_path_string = std::string(Paths::getUtbotLogAllFilePath()); - loguru::add_file(logfile_path_string.data(), loguru::Append, loguru::Verbosity_MAX); + loguru::add_file(logfile_path_string.data(), loguru::Append, verbosity); std::filesystem::remove(symLink.string()); std::filesystem::create_symlink(logfile_path_string, symLink.string()); diff --git a/submodules/build-klee.sh b/submodules/build-klee.sh old mode 100644 new mode 100755 diff --git a/vscode-plugin/package.json b/vscode-plugin/package.json index 32121399e..feb85fcf0 100644 --- a/vscode-plugin/package.json +++ b/vscode-plugin/package.json @@ -583,15 +583,15 @@ "@vscode/test-electron": "2.1.2", "eslint": "6.8.0", "glob": "7.2.0", - "mocha": "9.2.0" + "mocha": "^9.2.2" }, "dependencies": { "@types/google-protobuf": "3.15.5", "@types/node": "15.6.0", "@types/randomstring": "1.1.8", "@types/ssh2": "1.11.6", - "@types/vscode": "1.64.0", "@types/ssh2-streams": "0.1.9", + "@types/vscode": "1.64.0", "emittery": "0.10.1", "filepath": "1.1.0", "google-protobuf": "3.12.4", @@ -599,10 +599,10 @@ "grpc_tools_node_protoc_ts": "5.3.2", "grpc-tools": "1.11.2", "log4js": "6.5.2", + "node-ssh": "^13.0.0", "randomstring": "1.2.2", - "ssh2-streams": "0.4.10", "source-map-support": "0.5.21", - "typescript": "3.9.4", - "node-ssh": "^13.0.0" + "ssh2-streams": "0.4.10", + "typescript": "3.9.4" } } diff --git a/vscode-plugin/src/client/client.ts b/vscode-plugin/src/client/client.ts index 492731705..d453b79be 100644 --- a/vscode-plugin/src/client/client.ts +++ b/vscode-plugin/src/client/client.ts @@ -242,12 +242,12 @@ export class Client { private async writeLog(responseAny: any): Promise { const logEntry = responseAny as LogEntry; - utbotUI.channels().outputServerLogChannel.append(logEntry.getMessage()); + utbotUI.channels().outputServerLogChannel.append(logEntry.toString()); } private async writeGTestLog(responseAny: any): Promise { const gtestEntry = responseAny as LogEntry; - utbotUI.channels().outputGTestChannel.appendLine(gtestEntry.getMessage()); + utbotUI.channels().outputGTestChannel.appendLine(gtestEntry.toString()); } private async provideLogChannel(): Promise { @@ -776,10 +776,9 @@ export class Client { }, this.DEFAULT_TIMEOUT); serverResponse.on('data', async responseAny => { const response = responseAny as T; - const logEntry = response as LogEntry; started.value = true; await this.handleResponse(response, progressKey, resolve, responseHandler); - utbotUI.channels().outputServerLogChannel.append(logEntry.getMessage()); + utbotUI.channels().outputServerLogChannel.append(response.toString()); }) .on('error', (err) => { started.value = true; diff --git a/vscode-plugin/src/config/projectConfig.ts b/vscode-plugin/src/config/projectConfig.ts index cd565e64a..7687985c3 100644 --- a/vscode-plugin/src/config/projectConfig.ts +++ b/vscode-plugin/src/config/projectConfig.ts @@ -62,10 +62,10 @@ export class ProjectConfig { return this.handleJsonFilesNotFound(response.getType()); } case ProjectConfigStatus.BUILD_DIR_CREATION_FAILED: { - return this.createBuildDirFailed(response.getMessage()); + return this.createBuildDirFailed(response.toString()); } case ProjectConfigStatus.BUILD_DIR_SAME_AS_PROJECT: { - const message = response.getMessage(); + const message = response.toString(); logger.warn(message); messages.showWarningMessage(`${message}. Please, follow the [guilde](${ProjectConfig.guideUri}) to configure project.`); @@ -121,7 +121,7 @@ export class ProjectConfig { return this.configure(ConfigMode.CHECK); } case ProjectConfigStatus.BUILD_DIR_CREATION_FAILED: { - return this.createBuildDirFailed(response.getMessage()); + return this.createBuildDirFailed(response.toString()); } default: { this.handleUnexpectedResponse(); @@ -150,7 +150,7 @@ export class ProjectConfig { return true; } case ProjectConfigStatus.RUN_JSON_GENERATION_FAILED: { - const message = `UTBot tried to configure project, but failed with following message: "${response.getMessage()}"`; + const message = `UTBot tried to configure project, but failed with following message: "${response.toString()}"`; logger.warn(message); messages.showWarningMessage(`${message}. Please, follow the [guide](${ProjectConfig.guideUri}) to configure project.`); diff --git a/vscode-plugin/src/test/run.sh b/vscode-plugin/src/test/run.sh old mode 100644 new mode 100755