Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
ladisgin committed Mar 18, 2024
1 parent 5eb707b commit 98f2b72
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion server/src/utils/CLIUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
Empty file modified submodules/build-klee.sh
100644 → 100755
Empty file.
10 changes: 5 additions & 5 deletions vscode-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -583,26 +583,26 @@
"@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",
"grpc": "npm:@grpc/[email protected]",
"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"
}
}
7 changes: 3 additions & 4 deletions vscode-plugin/src/client/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,12 @@ export class Client {

private async writeLog(responseAny: any): Promise<void> {
const logEntry = responseAny as LogEntry;
utbotUI.channels().outputServerLogChannel.append(logEntry.getMessage());
utbotUI.channels().outputServerLogChannel.append(logEntry.toString());
}

private async writeGTestLog(responseAny: any): Promise<void> {
const gtestEntry = responseAny as LogEntry;
utbotUI.channels().outputGTestChannel.appendLine(gtestEntry.getMessage());
utbotUI.channels().outputGTestChannel.appendLine(gtestEntry.toString());
}

private async provideLogChannel(): Promise<void> {
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions vscode-plugin/src/config/projectConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.`);
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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.`);
Expand Down
Empty file modified vscode-plugin/src/test/run.sh
100644 → 100755
Empty file.

0 comments on commit 98f2b72

Please sign in to comment.