Skip to content

Commit

Permalink
Fix run scripts (#667)
Browse files Browse the repository at this point in the history
* Fix run scripts

* Change log level
  • Loading branch information
ladisgin authored Feb 2, 2024
1 parent 0b13146 commit 92f904d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docker/release_distribution_scripts/utbot_run_system.sh
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
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
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

0 comments on commit 92f904d

Please sign in to comment.