Skip to content
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

Fix run scripts #667

Merged
merged 3 commits into from
Feb 2, 2024
Merged

Fix run scripts #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cfc7d0
Fix run scripts
ladisgin Feb 1, 2024
f03121c
build portable container bump ubuntu version
ladisgin Feb 1, 2024
88e7893
Change log level
ladisgin Feb 2, 2024
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
2 changes: 1 addition & 1 deletion docker/release_distribution_scripts/utbot_run_system.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ then

#Server-specific parameters
UTBOT_EXECUTABLE_PATH=$UTBOT_BINARIES_FOLDER/$UTBOT_PROCESS_PATTERN
UTBOT_SERVER_OPTIONS="server --port $UTBOT_PORT --log=$UTBOT_LOGS_FOLDER"
UTBOT_SERVER_OPTIONS="--log=$UTBOT_LOGS_FOLDER server --port $UTBOT_PORT"
UTBOT_STDOUT_LOG_FILE=$UTBOT_LOGS_FOLDER/logs/"latest.log"

log "Starting a new server process; logs are written into [$UTBOT_LOGS_FOLDER] folder"
Expand Down
2 changes: 1 addition & 1 deletion docker/release_distribution_scripts/utbot_server_restart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fi

#Prompt kill all running UTBot servers with same port
IFS=";"
RUNNING=$( ps aux | grep "utbot server" | grep -v grep | grep "\-\-port $UTBOT_PORT" )
RUNNING=$( ps aux | grep "utbot .*server" | grep -v grep | grep "\-\-port $UTBOT_PORT" )

if test -n "$RUNNING"
then
Expand Down
8 changes: 4 additions & 4 deletions server/src/building/ProjectBuildDatabse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ void ProjectBuildDatabase::initObjects(const nlohmann::json &compileCommandsJson
} else {
jsonArguments = std::vector<std::string>(compileCommand.at("arguments"));
}
LOG_S(INFO) << "Processing build command: " << StringUtils::joinWith(jsonArguments, " ");
LOG_S(MAX) << "Processing build command: " << StringUtils::joinWith(jsonArguments, " ");
std::transform(jsonArguments.begin(), jsonArguments.end(), jsonArguments.begin(),
[&directory](const std::string &argument) {
return tryConvertOptionToPath(argument, directory);
Expand Down Expand Up @@ -188,13 +188,13 @@ void ProjectBuildDatabase::initInfo(const nlohmann::json &linkCommandsJson, bool
} else {
jsonArguments = std::vector<std::string>(linkCommand.at("arguments"));
}
LOG_S(INFO) << "Processing link command: " << StringUtils::joinWith(jsonArguments, " ");
LOG_S(MAX) << "Processing link command: " << StringUtils::joinWith(jsonArguments, " ");
if (StringUtils::endsWith(jsonArguments[0], "ranlib")) {
LOG_S(INFO) << "Skip ranlib command";
LOG_S(MAX) << "Skip ranlib command";
continue;
}
if (StringUtils::endsWith(jsonArguments[0], "cmake")) {
LOG_S(INFO) << "Skip cmake command";
LOG_S(MAX) << "Skip cmake command";
continue;
}
std::transform(jsonArguments.begin(), jsonArguments.end(), jsonArguments.begin(),
Expand Down
Loading